• Merge and Rebase
  • 1. Git Merge
    • 1.1 Merging
    • 1.2 Basic Merge Conflicts
  • 2. Git Rebase

Merge and Rebase

1. Git Merge

1.1 Merging

• Basic Merging

$ git checkout master
$ git merge hotfix

• Advanced Merging

• Three snapshots used in a typical merge

1.2 Basic Merge Conflicts

2. Git Rebase

$ git checkout experiment
$ git rebase master