When merging at local branches. Here we set a sample for merging master to {branch_name} at local. The script is a partation of this task.
cd {working_path}
git branch
git checkout -b {branch_name}
git commit
git checkout master
git merge --no-ff {branch_name}
git status
git push origin {branch_name}Merging branches at remote. We can finish this action by using UI tools by github website. Or we can use command: ( {branch_name} -> master )
cd {working_path}
git branch master
git checkout {branch_name}
git merge master
// Solve Conflicts
git commit
git checkout master
git merge --no-ff {branch_name}
git push origin master