I think what you want is to work with Feature branch - that’s a workflow concept in Git.
Basically, from the "root" branch of its development, in this case the develop2.0
, you create branches for each functionality you develop, and when you finish you merge the Feature branch into the develop2.0
.
The flow would be as follows:
- make sure you’re on the branch
develop2.0
git status
1.1. if not, go to branch develop2.0
git checkout develop2.0
- from the branch
develop2.0
start Feature branch to work on the feature, let’s call v2.0-F1 for example:
git checkout -b v2.0-f1
- work on the newly created branch
v2.0-f1
to finalize the changes and be ready to merge into develop2.0
3.1 When you’re done and ready to merge the new changes, go back to branch develop2.0
git checkout develop2.0
3.2 being in the branch develop2.0
merge the changes from v2.0-f1
git merge v2.0-f1
- Re-flow to the next Feature
I hope this stream helps you, I use it with team of 2 or more developers and works well.
git checkout -b meunovobranch develop2.0
?– Anthony Accioly