#merge

Git Merging and Resolving Conflicts

Merge branches in Git: fast-forward vs merge commits, how to read and resolve a merge conflict, and finishing the merge, with gitGraph diagrams.