Re: question about a merge result

On Thu, 30 Apr 2009, Francis Moreau wrote:

But the question was more about if the cortectness of the end result:
should 'B' removed after the merge.

IOW if someone works on its own branch remove B file and thought it
was a bad idea and restore it whereas another person remove B file but
miss the fact that it was a bad idea, does the merge should silently
remove B file ?

Consider that deciding to remove a file can happen for a variety of 
reasons. Maybe one branch wiped it out accidentally and restored it, while 
the other did a bunch of work to make it obsolete and then removed it 
intentionally. There's no reason to think that the reason behind reverting 
the delete on one branch applies to the other delete.

Now, if the "b1" branch had gotten the delete from "master" by merging the 
same commit, and had reverted the commit that deleted the file, then git 
should (and does) include the file in the merge result, because then some 
user saw that particular deletion and decided it was wrong and reverted 
it. (Of course, git doesn't actually consider this in its merge algorithm, 
but, for clever mathematical reasons, what it does is equivalent.)

	-Daniel
*This .sig left intentionally blank*