From: Sverre Rabbelier Date: Mon, 28 Jul 2008 19:48:08 GMT Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy Message-ID: In-Reply-To: <20080728181424.GM32057@genesis.frugalware.org> On Mon, Jul 28, 2008 at 20:14, Miklos Vajna wrote: > On Mon, Jul 28, 2008 at 04:54:17PM +0200, Sverre Rabbelier wrote: >> So, in short: what does the list think about adding >> "git-merge-theirs", that does (although possibly less 'hackish'): >> >> cat > git-merge-theirs << EOF >> #!/bin/sh >> eval git read-tree --reset -u \\\$\$# >> EOF > > Isn't this the stupid one? No, the stupid one did "take all non-conflicting hunks from our side, and any for conflicting hunks, take theirs", which was rather silly I must say, although I have heard one use-cases where it makes sense (no I don't think we should have a git-merge-theirs-on-conflict). > It's perfect for my testing needs, but this is not something that people > should ever use on a real repo. What about the use-case I described in my first mail? -- Cheers, Sverre Rabbelier