Syntax

Untitled

Automatic merging

Merge one branch into another

Aborting a merge

Keep changes from only one side of a merge

Merge with a commit

Finding all branches with no merged changes