[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gits] Branch Help

Okay, I am confused, which is a totally normal git state for me.

{110} boss.utah$ dirs

{111} boss.utah$ git status
# On branch aptui
# Your branch and 'central/aptui' have diverged,
# and have 313 and 249 different commits each, respectively.
nothing to commit (working directory clean)

So, this was a clean clone of emulab-devel. I added the aptui branch
as a tracking branch (also in emulab-devel).

Then I did in aptui:

boss> git rebase central/master

which I expected would bring over the last few weeks of commits into
the aptui branch I am sitting in. I did get a conflict, which I fixed
and then did a "git rebase --continue" which seemed okay.

But if I do a git log, I do not see the recent commits from master,
and the git status message above has me worried, I have no idea what
I will destroy at this point. My goal was to sync up aptui, push
that up, and then bring in Keith's changes, and then push up those.

I would be really happy if someone could help me!