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
More Related Contents:
- How do I resolve merge conflicts in a Git repository?
- I ran into a merge conflict. How can I abort the merge?
- Git merge left HEAD marks in my files
- Resolve Git merge conflicts in favor of their changes during a pull
- I ran into a merge conflict. How do I abort the merge?
- What is the best (and safest) way to merge a Git branch into master?
- Is there a “theirs” version of “git merge -s ours”?
- Undo git pull, how to bring repos to old state
- When would you use the different git merge strategies?
- How to import existing Git repository into another?
- What’s the difference between ‘git merge’ and ‘git rebase’?
- How can I prevent foxtrot merges in my ‘master’ branch?
- How can I merge two commits into one if I already started rebase?
- How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
- Git conflict markers [duplicate]
- How do I ‘overwrite’, rather than ‘merge’, a branch on another branch in Git?
- Git merge hotfix branch into feature branch
- Get changes from master into branch in Git
- Find unmerged Git branches?
- Merging without whitespace conflicts
- Is it possible to pull just one file in Git?
- Tell git not to merge binary files but to choose
- How to keep a branch synchronized/updated with master?
- Git merge doesn’t use default merge message, opens editor with default message
- How to see commits that were merged in to a merge commit?
- Merge, update, and pull Git branches without using checkouts
- Git: Merge a Commit into a different Branch
- Restore git files deleted after git merge –abort
- The following untracked working tree files would be overwritten by merge, but I don’t care
- How do you detect an evil merge in git?