Re: baffled again

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:04


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