[pull request] testcase22_option2: (base) PR1, (head) PR2

[dorawyy]

Different branches inside one repo, both Alice and Bob commit (to different files)

• Option2: What if he squash commits then merge?

Scenario abstract

--> Different branches inside one repo, both Alice and Bob commit (to different files)

• PR2 branch (Pull-Request-2 branch) was derived from PR1 branch (Pull-Request-1 branch)
• Alice and Bob worked on the same repo, Alice(PR2 branch), Bob(PR1 branch)
• Alice made commits on PR2 branch locally
• Alice git push origin PR2
• Bob made commits on PR1 branch locally
• Bob git push origin PR1
• Alice made a pull request to Bob: FROM: repo1, PR2 --> TO: repo1, PR1
• What would Bob do and meet?
  • Option2: What if he squash commits then merge?

Current project status (diverging)

Project status of branch PR2 (Alice worked on, head in this pull request)

Project status of branch PR1 (Bob worked on, base in this pull request)