合并两个分支不是主人

Question

I have a branch I created which is a decendant of master. 我有一个我创建的分支，它是master的后代。

master -> mybranch

I now need to merge in code from things/bugfix into mybranch 我现在需要将来自things / bugfix的代码合并到mybranch中

master -> things/bugfix

So I need things/bugfix code to be in mybranch 所以我需要在mybranch中使用/ bug修复代码

Answer 1

First checkout mybranch : 首先结帐mybranch ：

git checkout mybranch

Then merge things/bugfix into mybranch : 然后将mybranch things/bugfix合并到mybranch ：

git merge things/bugfix