当我将主题分支合并到 master 时,我收到了这条消息。我在 bitbucket 也有一个名为 origin 的遥控器,heroku 名为 dev(最初是 origin,但已重命名)。
我是否还应该说在 origin/bitbucket 后面有多少次提交?这是因为未克隆 bitbucket(现在的来源)吗?我怀疑它与跟踪分支有关,但我不完全确定这意味着什么。
mistakes|tags-2col ⇒ co master
Switched to branch 'master'
mistakes|master ⇒ gmerge tags-2col
Merge made by the 'recursive' strategy.
app.rb | 2 ++
views/new/all_tags.erb | 57 +++++++++++++++++++++++++++++++++---------------
2 files changed, 41 insertions(+), 18 deletions(-)
mistakes|master ⇒ gs
# On branch master
# Your branch is ahead of 'dev/master' by 2 commits.
#
nothing to commit (working directory clean)
mistakes|master ⇒ git remote
dev
origin