Re: baffled again

From: Linus Torvalds <torvalds@osdl.org>
Date: 2005-08-24 15:58:34
On Tue, 23 Aug 2005, Tony Luck wrote:
> 
> So GIT decides that the test branch has had a patch, and the release
> branch hasn't ... and so it merges by keeping the version in test.
> 
> Plausible?

Very. Sounds like what happened.

		Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Wed Aug 24 15:59:24 2005

This archive was generated by hypermail 2.1.8 : 2005-08-24 15:59:26 EST