{"thread":{"id":"28964","subject":"squashed commit messages handled different w/ and w/o conflicts","startedAt":"2011-11-17T20:31:47Z","lastAt":"2011-11-17T20:31:47Z","messageCount":1,"participants":["Daniel Malone"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179647","messageId":"CAOqtwH4vqQu=E9e5FLP0zFMa6jsDGt8rgojF489C11svY+g+bw@mail.gmail.com","threadId":"28964","inReplyTo":null,"subject":"squashed commit messages handled different w/ and w/o conflicts","fromName":"Daniel Malone","fromEmail":"dtp.malone@gmail.com","sentAt":"2011-11-17T20:31:47Z","receivedAt":"2011-11-17T20:31:47Z","isPatch":false,"sender":{"key":"dtp.malone@gmail.com","avatar":null},"body":"Hi,\n\nI was merging in a branch today and saw a (for me) unclear behavior.\nSo, what I did was:\n\ngit checkout master\ngit merge --squash _MY_BRANCH_\n\nAt this point I had a conflict. After fixing it I wanted to commit my\ncurrent state.\n\ngit add _CONFLICTED_FILE_\ngit commit\n\nWhat happens now is that the squashed commit logs are replaced with the\nConflict\n    some/file/with/a/path\nmessage.\n\nJust to be sure I created a test repo and merged in a branch with the\n--squash option. For this test I made sure no conflict would pop up.\nAfter committing the merged state, as expected, every commit message\nof the branch was set as the current commit message.\n\nI was expecting the conflict message to be pushed to the front of the\nsquashed commit messages.\n\n- Daniel\n"}]}