Nov. 22nd, 2012

[personal profile] swaldman
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 :-)

Profile

dw_dev_training: The stylised 'd', with the word 'dev' above, and the word 'training' at the side, representing the dw_dev_training comm. (Default)
Dreamwidth Development Training

September 2022

S M T W T F S
    123
45678910
1112131415 1617
18192021222324
252627282930 

Most Popular Tags

Page Summary

Style Credit

Expand Cut Tags

No cut tags
Page generated Aug. 11th, 2025 04:09 pm
Powered by Dreamwidth Studios