Merge and Rebase

Question 1

git merge

Answer 1

Merge into your current HEAD

Question 2

git rebase

Answer 2

Rebase your current HEAD onto

Question 3

git rebase –abort

Answer 3

abort a rebase

Question 4

git rebase –continue

Answer 4

continue a rebase after resolving conflicts

Question 5

git mergetool

Answer 5

use your configured merge tool to solve conflicts

Question 6

git add

Answer 6

use your editor to manually solve conflicts and (after resolving) mark as resolved

Question 7

git rm

Answer 7

use your editor to manually solve conflicts and (after resolving) mark as resolved