why skip the merge commits?
Posted Feb 21, 2007 5:03 UTC (Wed) by dlang
(✭ supporter ✭
In reply to: why skip the merge commits?
Parent article: Who wrote 2.6.20?
my git-foo isn't good enough to know the answer to this, so I'll as what's probably a dumb question
I know that the vast majority of merges are non-events like this, what happens when there is a conflict in the merge?
I thought the changes were recorded as part of the merge, the only other option would be for a merge, followed by the changes needed to make it work, and this would seem to cause problems for things like bisect
to post comments)