* Merge only complete commits
@ 2008-09-03 13:52 Ittay Dror
0 siblings, 0 replies; only message in thread
From: Ittay Dror @ 2008-09-03 13:52 UTC (permalink / raw)
To: git
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@gmail.com>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-09-03 13:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-03 13:52 Merge only complete commits Ittay Dror
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.