Before you do git mergetool
, you can checkout the files from the upstream. Then you can use git mergetool
to resolve the conflicts for the rest of the files.
git merge upstream squash
git checkout upstream -- <files that you want as "theirs">
git mergetool //Resolve the remaining conflicts.
To get the list of files, you can use git log --author=<email> --name-only --oneline
and parse the output to get list. Or you can do git checkout -- path/to/a/directory/
to checkout all the files from a specific directory without having to specifying all the files individually.