Branch created from another branch instead of master, What will happen if both branches make a pull request?
up vote
0
down vote
favorite
In my project I have my main branch "develop" and one of my partners created the branch A then I created unintentionally a branch B from that branch A instead of the branch "develop".
What will happen if both of us create a PR to develop?
The changes between both branches are not related, so is it better to create a different branch with only the changes made in branch B?
git request branch pull
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
add a comment |
up vote
0
down vote
favorite
In my project I have my main branch "develop" and one of my partners created the branch A then I created unintentionally a branch B from that branch A instead of the branch "develop".
What will happen if both of us create a PR to develop?
The changes between both branches are not related, so is it better to create a different branch with only the changes made in branch B?
git request branch pull
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47
add a comment |
up vote
0
down vote
favorite
up vote
0
down vote
favorite
In my project I have my main branch "develop" and one of my partners created the branch A then I created unintentionally a branch B from that branch A instead of the branch "develop".
What will happen if both of us create a PR to develop?
The changes between both branches are not related, so is it better to create a different branch with only the changes made in branch B?
git request branch pull
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
In my project I have my main branch "develop" and one of my partners created the branch A then I created unintentionally a branch B from that branch A instead of the branch "develop".
What will happen if both of us create a PR to develop?
The changes between both branches are not related, so is it better to create a different branch with only the changes made in branch B?
git request branch pull
git request branch pull
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
asked Nov 9 at 21:43
Ricardo Rubik Ruiz
104
104
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47
add a comment |
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47
add a comment |
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
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%2f53233615%2fbranch-created-from-another-branch-instead-of-master-what-will-happen-if-both-b%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
I'm not sure it matters a lot. A pull request is just a fancy name for "please merge this branch into that branch". You can rebase branch B onto the intended branch point if you want, or you can just live with branch B having branched off branch A (which is equivalent to branching off develop if nothing was commited to A before you branched).
– chepner
Nov 9 at 21:47