Hi,
Starting with '12345678', one branch creates a change '1A345678', the
other '1B345C78'. Merging of the branches will result in '1<A=B>345C78'.
But isn't it logical to assume that if changes 'B' and 'C' were done in
the same commit, then they are related and so a conflict in one
implicitly means a conflict in the whole commit?
Of course, in a case of a single file, with a single commit, it is easy
to detect. But what if there have been a history of commits before the
merge, or if several files were changed?
Maybe help me find the commit by including them in the RCS conflict
markers?
Ittay
--
--
Ittay Dror <ittay.dror@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
