On 03/26/10 06:23, Sebastian Pipping wrote:
Consequences
So Git relies on the existence of merge commits to detect what has been
merged already. Creating all these merge commits is a tough job for a
conversion tool (like svn2git) as it would have to distinguish between
cases
Hello!
As the prefix branch is not the last case where people may run into
problems with merging due to the conversion from SVN to Git I feel like
writing about it here.
In this mail
- The problem
- Merges in SVN
- Merges in Git
- Consequences
- Dealing with it
- The
Thanks, I've used your procedure to do that to the 2.1.7 branch and
it seems to have worked well (git cherry now gives the expected result):
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=797fb70107834d0346e5201b7a9aaa5d36978c81
--
Thanks,
Zac