Finishing the Merge

After editing#

git add <file>
git commit          # completes the merge

Git pre-fills the merge commit message; you rarely need to change it.

Checking before you commit#

git diff --staged

Read what you are about to record. In the editor, :Gitsigns diffthis or diffview shows the same thing with syntax highlighting.

If it goes wrong#

git merge --abort

Puts everything back exactly as it was before the merge started. The conflict is never a point of no return.