[testcase notes]#28: Pull Request, new conflicts coming with new commits

[dorawyy]

Scenario:

Julia's note:

Scratch of the test case:

Applied branches: PR1 and PR2

Start point

PR1 and PR2 in sync.

[dorawyy]

Steps:

Step1: commit on PR2

git checkout PR2
vim test28_pull_request
git add test28_pull_request
git commit -m "PR2: create file test28_pull_request: a=1,b=1,c=1"
git push origin PR2

Step2: Create a pull request from PR2(head branch) to PR1(base branch)

Only 1 commit, able to merge

Step3: Commit on PR1, conflict

git checkout PR1
vim test28_pull_request 
git add test28_pull_request 
git commit -m "PR1:created file test28_pull_request  a=0,b=1,c=1"
git push origin PR1

3.1 Now, the status of Pull Request becomes:

3.2 Resolve the conflict

3.3 A merge commit is created on PR2(head branch), also included into the pull request

3.4 After resolving the conflict, the pull request is eligible for merging again

Step4: New commit on PR1(base branch), new conflict

git checkout PR1
vim test28_pull_request
git add test28_pull_request
git commit -m "PR1:edited test28_pull_request; 'a=1,', 'b=2,', 'c=1'"
git push origin PR1

4.1 Now, new conflict appeared in the pull request due to the commit

4.2 Resolve the new conflict

4.3 Take the version of PR1 branch

4.4 The conflict is resolved, and a merge commit is created on PR2(head branch)

Step5: New commit on both PR1' and PR2`(head branch), new conflict

5.1 PR2: remove file test28_pull_request

git checkout PR2
git pull origin PR2
rm test28_pull_request
git add test28_pull_request
git commit -m "PR2: remove file test28_pull_request"
git push origin PR2

5.2 Now, PR2 history becomes:

5.3 The pull request becomes: (no conflict)

5.4 PR1: edit file test28_pull_request

git checkout PR1
git pull origin PR1
vim test28_pull_request
git add test28_pull_request
git commit -m "PR1: edited file test28_pull_request: a=3,b=3,z=3"
git push origin PR1

5.5 Now, PR1 history becomes:

5.6 The pull request becomes: (conflict again)

5.7 Resolve the conflict (as this is a delete-modification conflict, cannot resolve online, have to resolve locally)

5.8 Resolve the conflict locally

git fetch origin PR1
git fetch origin PR2
git checkout PR2
git merge PR1

Resolve the conflict by removing the file test28_pull_request, then continue merge

git commit 
git push origin PR2

5.9 Now the pull request is eligible for merging again

[dorawyy]

Step6: Merge the commit

• Option1: Create a merge commit --> enabled
• Option2: Squash and merge --> enabled
• Option3: Rebase and merge --> disabled

6.1 Choose Option1: Create a merge commit

Step7: Check the history of branches PR1 and PR2

PR1:

PR2:

Project Tree: