On Mon, Jul 28, 2008 at 20:14, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > On Mon, Jul 28, 2008 at 04:54:17PM +0200, Sverre Rabbelier <alturin@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
