On Wed, 29 Oct 2014 13:35:45 -0400
Maurizio Vitale <mrz....@gmail.com> wrote:
> recently I've seen a very bad (perforce) merge at work, where we
> had to reconcile two branches that have diverged for more than a
> year. Perforce, I don't care much.
> In the process of helping with that merge, I created many partial git
> repositories (and in some cases used git-imerge. That helped, but
> even with git large merges are not nice: you see all conflicts in
> some random order, you cannot easily revert part of the conflict
> resolution etc.
> Does anybody have examples of particularly large/bad merges in any OSS
> project I can use?
I'm sure you might get better results on the main Git list -- post a
(non-HTML) message to git at vger.kernel.org.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.