GIT Rebase

#switch to feature branch
git checkout feature/cool

# from feature/cool
git checkout feature/cool
git rebase master

# from master
git checkout master
git rebase feature/cool

Reference

• A better Git workflow with rebase