Re: my git problem

[Linus Torvalds <torvalds@linux-foundation.org>]

On Mon, 28 Apr 2008, Linus Torvalds wrote:
> 
> I don't actually see what was wrong with the old script.  The merge was
> really oddly done, but apart from that, something like this should work
> (just your old script with some trivial fixes to 'git merge' and using
> somewhat saner arguments):

Side note: you are still going to have *exactly* the same issue if you 
have other git trees (not origin) that contain the same patch. 

The fact is, your model of "merging by applying patches" is the real 
problem here. It's not a model that can work unless all trees are 
independent and they obviously aren't. So trying to merge with "origin" is 
only going to remove _one_ tree from the equation.

			Linus