For each conflicted file you get, you can specify git checkout –ours — <paths> # or git checkout –theirs — <paths> From the git checkout docs git checkout [-f|–ours|–theirs|-m|–conflict=<style>] [<tree-ish>] [–] <paths>… –ours –theirs When checking out paths from the index, check out stage #2 (ours) or #3 (theirs) for unmerged paths. The index may … Read more
Use git diff, with name-only to show only the names, and diff-filter=U to only include ‘Unmerged’ files (optionally, relative to show paths relative to current working directory) . git diff –name-only –diff-filter=U –relative
Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch: git reset –hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the “theirs” merge strategy: git pull –strategy=theirs remote_branch But this has since been … Read more
The line (or lines) between the lines beginning <<<<<<< and ====== here: <<<<<<< HEAD:file.txt Hello world ======= … is what you already had locally – you can tell because HEAD points to your current branch or commit. The line (or lines) between the lines beginning ======= and >>>>>>>: ======= Goodbye >>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:file.txt … is what … Read more
git pull -s recursive -X theirs <remoterepo or other repo> Or, simply, for the default repository: git pull -X theirs If you’re already in conflicted state… git checkout –theirs path/to/file
Those are conflict markers. You’re still in the process of merging, but there were some parts that Git couldn’t merge automatically. You’ll need to hand-edit those parts to what you want them to be and then commit the results. For instance, in your particular case, you’d probably want to resolve it like this (note – … Read more
Since your pull was unsuccessful then HEAD (not HEAD^) is the last “valid” commit on your branch: git reset –hard HEAD The other piece you want is to let their changes over-ride your changes. Older versions of git allowed you to use the “theirs” merge strategy: git pull –strategy=theirs remote_branch But this has since been … Read more
How do I resolve merge conflicts in a Git repository?