This is the mail archive of the
mailing list for the GDB project.
Re: GIT and CVS
> Date: Thu, 13 Oct 2011 22:02:45 -0700
> From: Joel Brobecker <firstname.lastname@example.org>
> Cc: Jan Kratochvil <email@example.com>, firstname.lastname@example.org,
> email@example.com, firstname.lastname@example.org
> One problem that you are not mentioning is the fact that the ChangeLog
> causes a never-ending stream of conflicts when applying patches.
This problem has been solved quite some time ago, both in git (where
you have git-merge-changelog driver), and in bzr (where you have the
changelog_merge plugin, now distributed as part of core bzr). I use
the latter, and didn't have a single ChangeLog conflict in many