git checkout --theirs <pathname>
Resolve a merge conflict by accepting the "incoming" branch changes
Resolves a merge conflict by accepting the changes from the "theirs" version (typically the branch you are merging into your current branch) for the specified file.
It discards changes from the "ours" version (the branch which is the target of the merge) and updates the file to the "theirs" version.
Sign in to enable bookmarking, reminders, progress-tracking and more...
Related
git checkout -b <branchname>git checkout -b <branchname1> <remote>/<branchname2>git checkout <branchname>git checkout -git checkout --<pathname>git checkout HEAD <pathname>git checkout --ours <pathname>git checkout -m <branchname>git checkout --orphan <branchname>git checkout -b <branchname> <commit>git checkout -t <remote>/<branchname>