@ Home / Everything else /

(Coding) How to resolve a conflict in Git by choosing {theirs}

Very quick aide-memoire for me: to quickly choose {theirs} when faced with a Git conflict, just do:

git checkout HEAD [filename]

Simples!

Blog entry by Alex Harries, Thursday 3 November 2011 —
Categories:

No comments available.

Add your comment

The content of this field is kept private and will not be shown publicly.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <img>
  • Lines and paragraphs break automatically.

More information about formatting options

CAPTCHA
Please type the text in the image to prove you're a human being - this helps to prevent spam (if you cannot see an image, please reload this page)
Image CAPTCHA
Enter the characters shown in the image.

Most-mentioned in the blog

more tags

(Possibly) related

Amateur geeknote: see which Git repository branch you're currently in at the command prompt
Drupal: strange MySQL "table doesn't exist" error caused by CCK, Features and Strongarm