{"thread":{"id":"15355","subject":"Merge only complete commits","startedAt":"2008-09-03T13:52:58Z","lastAt":"2008-09-03T13:52:58Z","messageCount":1,"participants":["Ittay Dror"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"89627","messageId":"48BE96BA.1000106@gmail.com","threadId":"15355","inReplyTo":null,"subject":"Merge only complete commits","fromName":"Ittay Dror","fromEmail":"ittay.dror@gmail.com","sentAt":"2008-09-03T13:52:58Z","receivedAt":"2008-09-03T13:52:58Z","isPatch":false,"sender":{"key":"ittay.dror@gmail.com","avatar":"https://gravatar.com/avatar/0dc47ece3354a295768075bb5afa328d49cda722c9f3100029ada80ee4561e22?d=mp&s=160"},"body":"Hi,\n\nStarting with '12345678', one branch creates a change '1A345678', the \nother '1B345C78'. Merging of the branches will result in '1<A=B>345C78'.\n\nBut isn't it logical to assume that if changes 'B' and 'C' were done in \nthe same commit, then they are related and so a conflict in one \nimplicitly means a conflict in the whole commit?\n\nOf course, in a case of a single file, with a single commit, it is easy \nto detect. But what if there have been a history of commits before the \nmerge, or if several files were changed?\n\nMaybe help me find the commit by including them in the RCS conflict \nmarkers?\n\nIttay\n\n\n-- \n--\nIttay Dror <ittay.dror@gmail.com>\n"}]}