Sep 15 2015
1. Merging on develop
git checkout develop git pull origin develop git merge yourBranch
This method is the most frequently used. It uses the recursive automatic merging method of Git to merge the changes of your branch upon the main develop branch.
2. Merging with rebase
git checkout yourBranch git rebase develop
In this method you are applying the develop branch upon yourBranch. If there is a conflict in the process of merging the process stops and you must fix your conflicts manually which may be an advantage some developers. Moreover it does not produce a merge commit message, so it helps to keep the commit history clean.
3. Merging with pull on your branch
git checkout yourBranch git pull origin yourBranch git pull origin develop