Hi Philip,
Am 2013-01-08 00:02, schrieb Philip Oakley:
That is, do I understand correctly that if I had used the default merge
strategy, and
somehow solved all the conflicts (so that none of the files had been changed
from F),
the result would have technically been exactly the same?
Hi Philip,
Am 2013-01-06 18:21, schrieb Philip Oakley:
Your issue [my mistake] is that the (gits's) merge process is a three way
merge, so you
have the two commits F and N to merge, but git will also locate the merge-base
at M
(which has the old directory structure), and compares the diffs
From: Carsten Fuchs carsten.fu...@cafu.de
Sent: Monday, January 07, 2013 9:21 AM
Hi Philip,
Am 2013-01-06 18:21, schrieb Philip Oakley:
Your issue [my mistake] is that the (gits's) merge process is a three
way merge, so you
have the two commits F and N to merge, but git will also locate the
'compatible' ;-) which will
establish a new merge base for future merges.
Philip
- Original Message -
From: Carsten Fuchs carsten.fu...@cafu.de
To: public-git-users-/jypxa39uh5tlh3mboc...@plane.gmane.org
Sent: Sunday, January 06, 2013 3:05 PM
Subject: [git-users] Re: Problem with moving
