[testcase notes] #24: Different Merge Strategies Test

[dorawyy]

Sumamry:

Branches used in the series of tests:

• ms1
• ms2

Files used in the series of tests:

• no conflict:
  • test24-ms1
  • test24-ms2
• content conflict:
  • test24-content-conflict
• edit/delete conflict:
  • test24-delete-modify-conflict

Preparation

• Created needed files and synced branches ms1 and ms2
• Details of the four files:

(content of test24-content-conflict)

(content of test24-delete-modify-conflict)

(content of test24-ms1 and test24-ms2)

• after preparation, the project status becomes:

references

• stackoverflow - When would you use the different git merge strategies?

[dorawyy]

Scenario1:

• ms1 and ms2 both edited same line of file test24-content-conflict, committed;
• when merging, conflicts

Scenario prep

• ms1 edited file test24-content-conflict line 2, commit;

git checkout ms1
# edit file test24-content-conflict, line 2
git add test24-content-conflict
git commit -m "ms1: edit file test24-content-conflict, line2"

(ms1 edit file test24-content-conflict, line 2)

(the project status becomes:)

• ms2 also edited file test24-content-conflict line X, commit;

git checkout ms2
# edit file test24-content-conflict, line 2
git add test24-content-conflict
git commit -m "ms2: edit file test24-content-conflict, line2"

(ms2 edit file test24-content-conflict, line 2)

(the project status becomes:)

• Then, start merging with different strategies... (all merge from ms2, merge with ms1)

1. Using resolve merge strategy

git checkout ms2
git merge ms1 -s resolve

Then resolve the conflict

• Use the ms1 version

• Continue merging

git add test24-content-conflict
git commit 
# then, auto commit message created for the merge

• Merge conflict resolved and project status becomes:

After work (reset back to before merging)

git checkout ms2
git reset --hard head~

• Current project status is:

2. Using recursive merge strategy (by default for merging two branches)

3. Using octopus merge strategy

4. Using ours merge strategy

5. Using subtree merge strategy