git checkout master # master is checked out
git pull # update local
git merge new-feature # merge branch new-feature into master
git push # changes on remote. Then checkout a feature branch//Make sure you are in your branch. Develop is a a branch in this case
git checkout master
Switched to branch 'master'
git pull
To pull changes of team members to your master
git checkout develop
git merge master
Resolve Conflicts in develop
git checkout master
git merge develop
To merge your final changes along with other changes to your master
git pull
If there were any additional changes made meanwhile
git push
To push the final master to the master repository
git checkout develop
//Move to branch again to work
//this is for merging into a local branch//
// checkout the branch to merge INTO
git checkout master
// merge local feature branch into master branch
git merge feature_branch_namegit checkout master
git branch main master -f
git checkout main
git push origin main -f
# Note that this code forces them to merge. Also got this from Stack Overflow
# and found it was incredibly useful for me.git status
git checkout master
git fetch
git pull
git merge X # X is the name of the branch you want to merge into the receiving branch.# merge two branches
1] you should be on MainBranch -- git checkout MainBranch
2] then run merge command -- git merge SubBranchgit merge existing_branch_name
git merge --no-ff existing_branch_name