Git合并并推送到正确的分支

Question

我有两个分支。分支A是团队工作分支，然后是分支B，这是我自己的个人开发分支。当我尝试将分支B合并到分支A并且我当前在分支B时，我是否需要在签出到A并将B合并到它之前添加，提交并将更改推送到原点A或原点B？

Answer 1

您只需将更改提交到B分支。

假设你在B分支上：

# git add file1 file2 file3 ...
# git commit -m "you know improving everything cause i'm awesome"
# git checkout A
# git merge B
# echo "you MAY need to commit the merge, sometimes this is done automagically"
# echo "now if you want your changes to be pushed..."
# git push A