There are 3 branches involved in this question. I have the
master branch, I have a
bug-fix branch, and I have a
This is the timeline:
masterto fix a bug.
masterto do some refactoring.
bug-fixbranch has been merged to
- Now in the
refactorbranch, I am going to refactor some areas in the file where the bug was fixed. But this branch still has the unfixed bug.
What's the best course of action to make at this point?
- Cherry-pick the fix from
- Continue refactoring and fix the conflict later on during merging.
- Rebase my current branch into master?