---
tags: DevOps
---
[GIT][JENKINS] Project development rule
===

****
* Branch naming
- Use following tag to create your branch
* bugfix/*** (Issue do not have to merge immediately)
* hotfix/*** (Issue should be solve immediately)
* feature/*** (Just one or more features in every sprint)
* release/*** (A stable version will be merge)

****
* Pull request
- Make sure you have rebased your branch already
* git checkout master
* git pull
* git checkout {your_branch}
* git pull
* git log --oneline (Find out your main commit id in the tree and took it as commit root)
* git rebase -i {commit root id}
* Edit your commit tree and set leaf's tag as s or squash to combine all leaves then save and exit
* Edit your commit summary
~~~
Template:
------------
What you do for conclusion:
- first feature
- sec
- third

[issue ticket ID]
~~~
* git push -f (Overwrite your branch on bitbucket server)
- If you want to edit your commit message or just one commit,use "git commit --amend & git push -f"
- When review done, make sure to click "delete branch" box

****
* Code review
- Reviewers can leave comments on bitbucket web browser
- Take at least two reviewers confirmed your pr and you are able to push master