"Tim Visher" <tim.visher@xxxxxxxxx> 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? -- 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
