New posts in Merge Conflict Resolution

Does Git keep a record of past merge conflicts?

How to resolve merge conflict in pull request in VSTS?

git merge conflict after git amend - "Your branch and 'origin/master' have diverged"

Why does git say "Pull is not possible because you have unmerged files"?

Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

Cannot checkout, file is unmerged

How does Git decide on conflicts?

Show conflict diff part of a merge

Cannot Merge due to conflict with UserInterfaceState.xcuserstate

Git merging hotfix to multiple branches