We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
What would happen if adding more commits after the pull request is made?
PR1
base branch
PR2
head branch
PR2 --> PR1
# create start point git checkout PR1 touch test21 vim test21 git add test21 git commit -m "testcase21: startpoint (create file test21 on PR1 branch)" git push origin PR1 git checkout PR2 git merge PR1 git push origin PR2
Edit in test21 is:
test21
The project start point status is:
git checkout PR2 vim test21 git add test21 git commit -m "PR2: commit1, in file test21 line 15" git push origin PR2
Commit1 edit is:
Project status after commit1 is:
base: PR1, head: PR2
base: PR1
head: PR2
Curerntly, the pull request page is like (with only 1 commit):
pull request
git checkout PR2 vim test21 git add test21 git commit -m "PR2: commit2, in file test21 line 16" git push origin PR2
Commit2 edit is:
The project status becomes (after commit2):
The text was updated successfully, but these errors were encountered:
More adds-on: When manually merging the two branches, the pull request will be closed automatically.
Sorry, something went wrong.
No branches or pull requests
Scenario
Exploration question:
What would happen if adding more commits after the pull request is made?
PR1
works asbase branch
, whilePR2
works ashead branch
PR2
branch, Bob worked onPR1
branchPR2
, pushedPR2 --> PR1
PR2
, pushedAnswer:
Test case steps
Step0: prep
Edit in
![screen shot 2017-10-21 at 6 27 01 pm](https://user-images.githubusercontent.com/16771854/31857214-74be9d8e-b68d-11e7-83c9-42930563d858.png)
test21
is:The project start point status is:
![screen shot 2017-10-21 at 6 27 59 pm](https://user-images.githubusercontent.com/16771854/31857222-9a93b670-b68d-11e7-8784-5ef05147785e.png)
Step1: Alice, 1 commit on
PR2
Commit1 edit is:
![screen shot 2017-10-21 at 6 28 45 pm](https://user-images.githubusercontent.com/16771854/31857228-b7a43bea-b68d-11e7-9e48-3e67516c699d.png)
Project status after commit1 is:
![screen shot 2017-10-21 at 6 29 34 pm](https://user-images.githubusercontent.com/16771854/31857232-d5a5346e-b68d-11e7-8abd-08151ccc2789.png)
Step2: Alice created a pull request
base: PR1
,head: PR2
Curerntly, the
![screen shot 2017-10-21 at 6 32 48 pm](https://user-images.githubusercontent.com/16771854/31857254-63719788-b68e-11e7-97a8-88a60e61f231.png)
pull request
page is like (with only 1 commit):Step3: Alice made more commits on
PR2
Commit2 edit is:
![screen shot 2017-10-21 at 6 34 29 pm](https://user-images.githubusercontent.com/16771854/31857263-82eef952-b68e-11e7-9a50-5da60b9ec845.png)
The project status becomes (after commit2):
![screen shot 2017-10-21 at 6 35 11 pm](https://user-images.githubusercontent.com/16771854/31857267-b16a4ea8-b68e-11e7-8f4d-103ffcf589bb.png)
Step4: Back to check what happened inside the pull request
The text was updated successfully, but these errors were encountered: