Mark the file as resolved after a merge conflict

Related How Tos:

• Merge branches
• Finalize the merge commit after resolving conflicts
• Abort a merge
• Resolve conflicts visually using a merge tool
• Rebase the current branch
• Cherry-pick commits

Search Git Commands | More How Tos