SHELL

Merge master branch to main branch - Github

git checkout main
git merge master
git push origin main

git merge master into branch

git checkout [branchname]
git merge master
git push origin [branchname]

git merge master to branch

git checkout <branchname>
git merge master -m 'your message here'
git push origin <branchname>

git merge master into branch

# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master

$ git merge feature
$ git push origin/master

merge branch to master

$ git checkout master
$ git branch new-branch
$ git checkout new-branch

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch

merge to master github

# Simple Git Workflow

$ git checkout master
$ git branch new-branch
$ git checkout new-branch

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch

github merge branch to master

#use new_branch
git fetch
git checkout new_branch
#add changes
git add .
#commit the changes
git commit -m 'some message'
#push to new branch
git push

#create pull request from git repo
#you can also merge from github/bitbucket using the merge button

#switch to master branch
git checkout master
#merge with new_branch
git merge new_branch
#push changes to master branch
git push