How to merge master into branch submitted as pull request?
up vote
0
down vote
favorite
Scenario:
- I sent a pull request up that is being reviewed. (1)
- While my pull request was being reviewed, another pull request got merged into master. (2)
- When this happened, the travis builds for my pull request started failing because of the changes in (2).
- (2) has some new files that are not yet present in my pull request
Question
How can I get the master and merge it into my branch and push the changes to github so that travis builds start again.
git github
asked Nov 9 at 3:47
Anthony
9,3662288172
add a comment |
up vote
0
down vote
favorite
Scenario:
- I sent a pull request up that is being reviewed. (1)
- While my pull request was being reviewed, another pull request got merged into master. (2)
- When this happened, the travis builds for my pull request started failing because of the changes in (2).
- (2) has some new files that are not yet present in my pull request
Question
How can I get the master and merge it into my branch and push the changes to github so that travis builds start again.
git github
asked Nov 9 at 3:47
Anthony
9,3662288172
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54
add a comment |
up vote
0
down vote
favorite
up vote
0
down vote
favorite
Scenario:
- I sent a pull request up that is being reviewed. (1)
- While my pull request was being reviewed, another pull request got merged into master. (2)
- When this happened, the travis builds for my pull request started failing because of the changes in (2).
- (2) has some new files that are not yet present in my pull request
Question
How can I get the master and merge it into my branch and push the changes to github so that travis builds start again.
git github
asked Nov 9 at 3:47
Anthony
9,3662288172
Scenario:
- I sent a pull request up that is being reviewed. (1)
- While my pull request was being reviewed, another pull request got merged into master. (2)
- When this happened, the travis builds for my pull request started failing because of the changes in (2).
- (2) has some new files that are not yet present in my pull request
Question
How can I get the master and merge it into my branch and push the changes to github so that travis builds start again.
git github
git github
asked Nov 9 at 3:47
Anthony
9,3662288172
asked Nov 9 at 3:47
Anthony
9,3662288172
asked Nov 9 at 3:47
Anthony
9,3662288172
asked Nov 9 at 3:47
Anthony
9,3662288172
asked Nov 9 at 3:47
Anthony
9,3662288172
9,3662288172
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54
add a comment |
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54
add a comment |
1 Answer
1
active
oldest
votes
up vote
0
down vote
After the other pull request has been approved - which resulted in the changes to be merged into master - you now need to merge master back to you branch and retest your branch.
You can do it via:
git fetch origin mastergit merge origin/mastergit push
or
git checkout mastergit pullgit checkout your_branchgit merge mastergit push
answered Nov 9 at 4:28
tymtam
6,28133154
I have the original repository (the one I forked) asupstream
– Anthony
Nov 9 at 11:59
add a comment |
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
up vote
0
down vote
After the other pull request has been approved - which resulted in the changes to be merged into master - you now need to merge master back to you branch and retest your branch.
You can do it via:
git fetch origin mastergit merge origin/mastergit push
or
git checkout mastergit pullgit checkout your_branchgit merge mastergit push
answered Nov 9 at 4:28
tymtam
6,28133154
I have the original repository (the one I forked) asupstream
– Anthony
Nov 9 at 11:59
add a comment |
up vote
0
down vote
After the other pull request has been approved - which resulted in the changes to be merged into master - you now need to merge master back to you branch and retest your branch.
You can do it via:
git fetch origin mastergit merge origin/mastergit push
or
git checkout mastergit pullgit checkout your_branchgit merge mastergit push
answered Nov 9 at 4:28
tymtam
6,28133154
I have the original repository (the one I forked) asupstream
– Anthony
Nov 9 at 11:59
add a comment |
up vote
0
down vote
up vote
0
down vote
After the other pull request has been approved - which resulted in the changes to be merged into master - you now need to merge master back to you branch and retest your branch.
You can do it via:
git fetch origin mastergit merge origin/mastergit push
or
git checkout mastergit pullgit checkout your_branchgit merge mastergit push
answered Nov 9 at 4:28
tymtam
6,28133154
After the other pull request has been approved - which resulted in the changes to be merged into master - you now need to merge master back to you branch and retest your branch.
You can do it via:
git fetch origin mastergit merge origin/mastergit push
or
git checkout mastergit pullgit checkout your_branchgit merge mastergit push
answered Nov 9 at 4:28
tymtam
6,28133154
answered Nov 9 at 4:28
tymtam
6,28133154
answered Nov 9 at 4:28
tymtam
6,28133154
answered Nov 9 at 4:28
tymtam
6,28133154
6,28133154
I have the original repository (the one I forked) asupstream
– Anthony
Nov 9 at 11:59
add a comment |
I have the original repository (the one I forked) asupstream
– Anthony
Nov 9 at 11:59
I have the original repository (the one I forked) as
upstream– Anthony
Nov 9 at 11:59
I have the original repository (the one I forked) as
upstream– Anthony
Nov 9 at 11:59
add a comment |
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53219586%2fhow-to-merge-master-into-branch-submitted-as-pull-request%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
How does Travis build knew about 2 if it was building for 1 ? Travis build for 1 should not be affected by 2. Best solution for your problem - abandon 1, merge master in your branch and raise new PR 3.
– Aky_0788
Nov 9 at 3:51
Take a look at stackoverflow.com/questions/53199291/… I think that might be what you need.
– asherber
Nov 9 at 3:54