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

[gits] Branch Help

On Wed, Jan 08, 2014 at 10:38:05AM -0800, Leigh Stoller wrote:
> 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!

Have you tried a "git fetch central master" immediately beforehand?
The rebase will be computed only on your local ref to central/master,
which might be stale.

Bye for now,
       Gary Wong      gtw at flux.utah.edu      http://www.cs.utah.edu/~gtw/