Branch Exercises

Part I

• git branch name of branch
• Fast forward merge is used when git can tell in what order the commits happened. Recursive merge is used when there are different commits at different times on two branches.
• git checkout
• git branch -d
• Merge conflicts happen when changes are committed to the same file from two different branches.