[gits] Branch Help

[lbstoller at gmail.com (Leigh Stoller)]

> Depending on your goal, you might consider whether a merge would be more 
> appropriate. In this case, I'm guessing that you would want to merge master 
> into aptui, to bring the aptui branch up to date with respect to mainline 
> changes (while keeping the aptui-specific changes out of master). 

Are you saying that I should "git merge master" into aptui instead
of doing the rebase? I thought we wanted to always do rebase or else
the push would be rejected? And if so, what would you suggest I do
at this point?

Oh I know, stop using a branch for aptui! 

Lbs