[testcase notes] #29: Git merge categorization

[dorawyy]

git merge Categorization

Intro of different options --> #64

Fast-forward Merge

Three-way Merge

[dorawyy]

Three-way Merge

Three-way merge with single conflict

git checkout mt3
git merge mt4

git checkout mt3
git merge mt4 --no-commit

git checkout mt3
git merge mt4 --squash

Additional test: if commit6 created a new file, not existing in mt3 after commit5:

[dorawyy]

Three-way merge with no conflict

git checkout mt1
git merge mt2 

git checkout mt1
git merge mt2 --no-commit

git checkout mt1
git merge mt2 --squash

Additional test: If commit6 happens after commit5, then merge; No matter what merge option (normal/squash/no-commit) file in commit6 will always be seen bymt1.