2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:49
"Tim Visher" [off-list ref] writes:
I have a binary file that is coming up with a merge conflict (obviously) between two branches and I want to simply say, 'take their version of the file'.
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?
From: Tim Visher <hidden>
Date: 2016-06-15 22:45:49
On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano [off-list ref] 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