github merge

//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_name$ git checkout master
Switched to branch 'master'
$ git merge iss53// Go to the main branch you want the side branch to be merged to
git checkout <Main branch name>

// Merge your side branch
git merge <Side branch name>