Pretty often we are in situation where we need to merge branches especially while using "branch per feature" pattern to push our changes to repo. You may follow these simple yet very important steps to merge your branches. Assuming that you are on "master" branch on your local repo, do this to check the branch. git branch Expected output master Checkout the branch you want to merge, example you want to merge branch "feature-devise", So do this git checkout feature-devise Expected output master feature-devise Come back on master branch to start merge process git