[gits] Branch Help

[ricci at cs.utah.edu (Robert Ricci)]

No, git push will not refuse merges - it *may* refuse rebases, if the cause changes to commits that have already been pushed up.

The main difference is: do you want to pretend development happened in a linear fashion (use rebase), or is it fine to ?admit? that it occurred in parallel for a long them, then was brought together (use merge). I tend to use rebase when I?m about to push a few modest changes, because there?s no real benefit to seeing a thousand tiny branches in the history. However, for cases like this, where someone works on a feature for weeks on their own, it?s reasonable to see that in the history as a branch splitting off and getting merged back in.

On Jan 8, 2014, at 12:04 PM, Leigh Stoller <lbstoller at gmail.com> wrote:

>> 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