分支落后于主人 [英] Branch is behind master

问题描述

我目前只是在弄混git而无法弄清楚如何为新的提交设置分支.我当前的git历史记录如下:

I'm currently just messing around with git and cant figure out how to set a branch to a newer commit. My current git history looks like this:

6be8bf1 (HEAD, master)
701c50a
95cfe6b (origin/mybranch)
1a82bd5
...

我如何编辑历史记录以使其看起来像波纹管?

How can I edit my history to look like bellow?

6be8bf1 (HEAD, master, origin/mybranch)
701c50a
95cfe6b
1a82bd5
...

推荐答案

(假设您的本地信息与来源同步，即您已经运行 git fetch ):

(assuming your local is in sync with origin i.e. you've run git fetch already):

git checkout mybranch

git branch --set-upstream-to = origin/mybranch mybranch

git merge master

在此阶段验证您的设置如下:

Verify that your setup looks like this at this stage:

6be8bf1 (HEAD, master, mybranch)
701c50a
95cfe6b
1a82bd5

git push origin mybranch

这篇关于分支落后于主人的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！