Simon (![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
swaldman) wrote in ![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png)
dw_dev_training2012-11-22 10:05 am
swaldman) wrote in dw_dev_training2012-11-22 10:05 am
Entry tags:
Git question
Scenario:
- I worked on bug A and submitted a pull request. That hasn't yet been accepted.
- I want to work on bug B, which expands upon A and changes the same bits of code.
- Since A has not yet been accepted, its changes are not yet in the develop branch. However, I still have A's branch available to me.
Is there a way in which I can base B on A and (assuming that A is accepted without changes) have it all merge nicely in the end? Or do I need to wait for A to be merged into develop first?
Also, if there is a way, is there going to be a big problem if A then *isn't* accepted / requires changes / whatever?
Thanks :-)
- I worked on bug A and submitted a pull request. That hasn't yet been accepted.
- I want to work on bug B, which expands upon A and changes the same bits of code.
- Since A has not yet been accepted, its changes are not yet in the develop branch. However, I still have A's branch available to me.
Is there a way in which I can base B on A and (assuming that A is accepted without changes) have it all merge nicely in the end? Or do I need to wait for A to be merged into develop first?
Also, if there is a way, is there going to be a big problem if A then *isn't* accepted / requires changes / whatever?
Thanks :-)