On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Do you mean during a conflicted merge resolution you would want to check > their version out of the index and declare that it is the merge result? Sure. Let me try to be a bit clearer. I was developing on a feature branch and now want to merge back into the master branch. Unfortunately, a binary file somewhat central to the development effort was changed between the the feature branch and the master branch and now there is a conflict. Obviously, I can't fix the conflict via markers or something like that because it's a binary file, and I know that I want the feature branch's version of the file, not the one that it is in conflict with. How would I just select the stage3 version of the file and add that to the index? -- In Christ, Timmy V. http://burningones.com/ http://five.sentenc.es/ - Spend less time on e-mail -- 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
