слияние развивается в филиал
git checkout develop
git pull
git checkout branch-x
git rebase develop
Strange Sardine-JM
git checkout develop
git pull
git checkout branch-x
git rebase develop
1. //pull the latest changes of current development branch if any
git pull (current development branch)
2. //switch to master branch
git checkout master
3. //pull all the changes if any
git pull
4. //Now merge development into master
git merge development
5. //push the master branch
git push origin master