{"thread":{"id":"25502","subject":"Rebase vs Rebase-I differences","startedAt":"2010-10-21T15:19:41Z","lastAt":"2010-10-21T15:19:41Z","messageCount":1,"participants":["Jan Engelhardt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"153972","messageId":"alpine.LNX.2.01.1010211717050.10096@obet.zrqbmnf.qr","threadId":"25502","inReplyTo":null,"subject":"Rebase vs Rebase-I differences","fromName":"Jan Engelhardt","fromEmail":"jengelh@medozas.de","sentAt":"2010-10-21T15:19:41Z","receivedAt":"2010-10-21T15:19:41Z","isPatch":false,"sender":{"key":"jengelh@medozas.de","avatar":null},"body":"Hi,\n\n\nsmall bug observed in git 1.7.1: when one does `git rebase otherbranch` \nand there is a conflict, the conflict markers won't be showing the SHA \nid. In contrast to that, they do appear when using `git rebase -i \notherbranch`.\n\n<<<<<<<\nthis\n=======\nthat\n>>>>>>> 75a435a... commit message\n"}]}