I have a class
Foo with lots of fields and have two tickets to refactor that class.
- the first ticket is to rename it to
Booand two move it to another package.
- the second one is to rename some fields in
I have implemented the first one in a branch. It is not merged yet. Now I'm stuck with a second branch.
One option is to create it from the master, but in this case, after merging the first branch, git will not be able to resolve that movement and renaming of
Foo. I'll get merge conflicts and in order to resolve it - I'll have to make all my changes related to the second ticket once again.
Another option is to create a second branch on top of the first one. But in this case - branches become dependable, what is not correct, because according to the definition, these branches should be able to be merged independently.
What is the most effective option in this case?