git merge branch
## git checkout master (base) sungmin@sungminyunui-MacBookPro git % git checkout master Already on 'master' Your branch is up to date with 'origin/master'. (base) sungmin@sungminyunui-MacBookPro git % git merge v2 merge: v2 - not something we can merge Did you mean this? origin/v2 ## prepare oracle client (base) sungmin@sungminyunui-MacBookPro git % git merge --squash origin/v2 error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. (base) sungmin@sungminyunui-MacBookPro git % git push -f warning: redirecting to http://git.gnoti.com/gnoti/git.git/ Everything up-to-date (base) sungmin@sungminyunui-MacBookPro git % git merge --squash origin/v2 error: Merging is not possible because you have unmerged files. hint: Fix them up in the work t