New posts in Git Merge Conflict

Is there some kind of 'git rebase --dry-run', which would notify me of conflicts in advance?

How do I resolve git merge conflicts on a submodule from `git stash pop`

Choose Git merge strategy for specific files ("ours", "mine", "theirs")

How do I use vimdiff to resolve a git merge conflict?

Git Merge Conflict - Remote File Deleted, Local File Changed

Resolve Git merge conflicts in favor of their changes during a pull

Git merge left HEAD marks in my files

What's the simplest way to list conflicted files in Git?

How can I discard remote changes and mark a file as "resolved"?

How to resolve merge conflicts in Git repository?