Resolving Merge Conflicts in Git
Checkout all their files
git checkout --theirs directory/* git add directory/*
Note, if the remote has deleted files, you will have to remove them with git rm directory/file.ext before you can checkout theirs with a glob wildcard.
You can remove all deleted files in one go with the following:
git rm $(git ls-files --deleted)
Checkout all our files
git checkout --ours directory/* git add directory/*
Available Wiki Topics
The operator of this site makes no claims, promises, or guarantees of the accuracy, completeness, originality, uniqueness, or even general adequacy of the contents herein and expressly disclaims liability for errors and omissions in the contents of this website.