We have been working on a codebase with one git
We have got to a point now where we actually need to branch it for one feature and remove that feature from the master branch.
So we currently have
[master] <- one branch with feature 1 and feature 2
But I want to get it to look like this
[master] <- only feature 1 [feature-2] < - feature 1 and feature 2 (what the master is now)
What is the best way to do this? The only way I can think is to create
[feature-2] branch from the master, then just delete all the code I don't want in master.
However, we may have bug fixes etc for feature 1 that need to be done in
[master] and then merged into
I can't just branch from an old commit either as the two features have been developed somewhat concurrently.
Is there a way to deal with this scenario better so I can still merge branches together etc?