I have different tags / releases, 1.0, 1.0.1, 1.0.2, 1.0.3. At present, the preparation of the Master Branch 1.1.0 is bleeding.
Now I realized that I needed to push a small patch, 1.0.4.
Make the best way to do patch based on 1.0.3, press it on the gitub, tag it as 1.0.4, but still keep the master branch on the bleeding edge and Prepare for 1.1.0?
Edit: The question in the store (note, it actually v1.0.5 -> v1.0.6):
You check the commit you want to make your patch on the base. Make whatever you need, make your command, tag the result and push them to bring them to your main line, you can choose either cherry or choose those commands or merge them into the branch.
Now, it can be a bit weird if the new tag is not in a branch. I have certainly never seen a branch which is accessible only by one tag. Therefore, my personal recommendation will be to merge the branch back.
Be a little more solid:
$ git checkout -b v1.0.5_fixes v1.0.5 # create a bugfix branch # ... do some work .. # ... commits ... $ git tag v1.0.6 $ git checkout master $ git merge v1.0.5_fixes # merge back merge merge tribs, if any $ git branch-v v1.0.5_fixes # branch Delete, no longer required
No comments:
Post a Comment