Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

2
  • 1
    Thanks for that. I wasn't sure if there was some sort of build-in way to mark a file as the 'correct' one. Explains why I couldn't find the non-existent command though! Commented Nov 10, 2008 at 18:35
  • Yep, thats a bit unintuitive - something like git resolve would be nice, but would also be an extra step ... Commented Nov 10, 2008 at 20:22