-
Notifications
You must be signed in to change notification settings - Fork 0
Workflow feature
KS LIM edited this page Jul 29, 2021
·
5 revisions
A. WorkFlow:
- Create new branch from develop branch and call it "feature-"
- Work on feature, committing to this feature branch
- Test your feature
- Merge your feature into develop branch
- Delete your feature branch
- Once enough features and/or fixes have been completed, prepare your release
- When release is tested and prepped, merge develop into master
- Tag master branch commit with release number
- Repeat
B. Create a LICENSE :
$ touch LICENSE$ git add LICENSE$ git commit -m "Add License"$ git push origin main
C. Create Tag :
$ git tag -a v1.0 -m "Add first tag"$ git show v1.0-
$ git tagto see our tag marker that is v1.0 -
$ git push --tags origin main or masterto push the tag to the remote master or main depend on your setting $ git log --oneline --decorate --graph --all- How to tag an older commit in Git?
git tag -a v1.2 9fceb02 -m "Message here"
D. Create Feature branch: if you got couple of peoples working together at the develop branch at once
E. To merge the feature branch into the develop we type
- checkout to the develop branch
$ git checkout develop - merge the feature branch into it
$ git merge feat1develop will be updated by the feature branch - next is to delete the feat1 branch
$ git branch -d feat1 - next checkout to the master or main branch
$ git checkout main - "$ git merge develop" this will bring the develop into the master branch
and you will see theFast-forwardkeyword it mean you move the master branch all the way to the latest commit - then tag the master branch
$ git tag -a v1.1 -m "Added second release tag"