(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!

Categories:

Most-mentioned in the blog