[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Stupid git!

From: Stephen J. Turnbull
Subject: Re: Stupid git!
Date: Tue, 15 Sep 2015 09:24:19 +0900

Alan Mackenzie writes:

 > Yes.  I had misunderstood "conflict".  I had thought it meant a merge
 > conflict in some file, whereas it just meant that other, possibly
 > unrelated, changes had taken place.

No, "conflict" means that there are conflicts in a file so that the
expected outcome of the merge is indeterminate, just like every other
VCS.  There could be a bug in git's implementation, but this
terminology is standard in git as in other VCSes.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]