merging

Merging

Prerequisites

• Branches

Course

Learn what a merge is, how to perform one, and how to resolve conflicts.

These parts of the Using branches chapter of Atlassian's git tutorial are a good start:

• git merge
• Merge conflicts
• Merge strategies