- workflow cheatsheet
- git flow vs git command comparison alternative
- workflow tutorial (without git flow. just as reference to do pull request.)
- General Workflow
-
clone repository
git clone https://github.com/megabitid/LostnFound_Backend.git -
init git flow
git flow init- set production branch name to : master
- leave all option as default (press enter)
-
working with other people feature
git fetch origin feature\feature_name git checkout feature\feature_name -
start new feature
git flow feature start your_feature -
add all to stagging
git add . -
Commit message. I recommend using emoji
git commit -m ":emoji_code: commit message" -
publish your feature update to this remote repository so others can see.
git flow feature publish your_feature -
If you decided that your feature completed, do pull request. Make sure you pull request into develop branch.
- Wait until it gets approved. Merge button will activate if it's approved.
- Merge by yourself or merged by reviewer. You can use merge button or command bellow to merge.
-
Finish your feature
- pull new change from develop branch just in case it's updated.
git checkout develop && git pull origin develop - Because of git flow feature finish does not push immediately, we use command bellow.
- merge your_feature branch
git merge --no-ff feature/your_feature - push your merge to develop
git push origin develop - delete feature branch in your local and remote
git branch -d feature/your_feature && git push origin :feature/your_feature
- pull new change from develop branch just in case it's updated.
-