git merge the current branch into the other branch

本帖最後由 chimp 於 2015-1-20 23:40 編輯

git merge 係merge the other branch into the current branch

我想merge the current branch into the other branch
(原本在branchA)
>git checkout master
>git merge brancha
>git checkout brancha


有冇一個command完成?
merge可能有conflict所以三句寫埋做一個shell script唔係幾好(唔識寫if error level)