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
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
Latest Git: git merge –abort This attempts to reset your working copy to whatever state it was in before the merge. That means that it should restore any uncommitted changes from before the merge, although it cannot always do so reliably. Generally you shouldn’t merge with uncommitted changes anyway. Prior to version 1.7.4: git reset … 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
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