Naming convention

Item	Name
Release branch	release/v2.0.1
Feature branch	feature/2234_my_feature_name
Hotfix branch	hotfix/my_hotfix_name
Commit	#2234 add my news
Tag	v2.0.1
Hotfix Tag	v2.0.1.1

HOWTO

I want to switch to a release branch

git checkout release/v2.0.1

I want to switch to a tag

git checkout v2.0.1

I want to work on an issue / feature

git checkout release/v2.0.1
git checkout -b feature/2234_my_feature_name

I want to get all new commit from a release branch in my feature branch

git checkout feature/2234_my_feature_name
git rebase release/v2.0.1
git push -f feature/2234_my_feature_name
# Or git rebase release/v2.0.1 feature/2234_my_feature_name

I want to merge my two last feature commits in a single commit to clean the history and make future merges easier

git rebase -i HEAD~2
git push -f

I want to get only one commit from another branch in the current branch

git cherry-pick 28f0f05

I want to merge my feature in a release branch

Without code review (and PR / MR) :

git checkout release/v2.0.1 # Switch to the release branch
git pull --rebase orgin release/v2.0.1 # Get all new commits on the release branch, or git pull --ff-only orgin release/v2.0.1
git merge feature/2234_my_feature_name # Merge the feature
git push origin release/v2.0.1 # Send the completed feature branch
git branch -d feature/2234_my_feature_name # Delete the local feature branch
git push origin :feature/2234_my_feature_name # Delete the remote feature branch

With code review and PR :

git checkout feature/2234_my_feature_name
git rebase release/v2.0.1
git push -f origin feature/2234_my_feature_name

Then go to Github / Gitlab, and create the PR. Wait for the +1 from another team member, then use the Merge PR button, checking Delete the merged branch checkbox

I want to create a new release branch

git checkout release/v2.0.1
git checkout -b release/v2.0.2
# Or git checkout -b release/v2.0.2 release/v2.0.1

I want to merge a release branch in master

git checkout master # Switch to master
git merge release/v2.0.1 # Merge the release branch into master
git push origin master # Send master
git tag -a v2.0.1 -m 'version 2.0.1' # Create a new tag
git push origin v2.0.1 # Send the new tag

I want to create a new tag

git checkout master
git tag -a v2.0.1 -m 'version 2.0.1'
git push origin v2.0.1

I want to delete an old release branch (a new one has been merged in master)

git branch -d release/v2.0.1
git push origin :release/v2.0.1

I want to do a hotfix

git checkout -b hotfix/fix_some_things release/v2.0.1
# Work & commit ...
git checkout release/v2.0.1
git merge hotfix/fix_some_things
git checkout master
git merge release/v2.0.1
git tag -a v2.0.1.1 -m 'version 2.0.1.1 - hotfix'
git branch -d hotfix/fix_some_things
# Merge the hotfix in working branches
git co release/v2.0.2
git merge release/v2.0.1

mRoca/git_flow.md