[dev] Fwd: Rebase vs. Merge

[Michael M Slusarz]

Quoting Ben Klang <ben at alkaloid.net>:

> As long as we're talking only about local branches, I think we are  
> all in agreement.  The above instructions work great, and it's what  
> I do for local branches.
>
> My concern comes from multiple developers working on remote  
> branches, in this case the branch remote living on dev.horde.org.  I  
> agree with what you said above that "I want my topic branches to  
> only contain the differences to master."  My question is how to go  
> about doing that with a remote tracking branch.  In my  
> experimentation so far, I've found that performing a rebase to  
> master on a remote-tracking branch makes me unable to push the  
> branch back upstream.  The only way I've found to update my  
> remote-tracking branch has been to merge from master, but obviously  
> that leaves me with a messy history.

I will echo Mike R.'s statement that this has never been an issue for  
me.  You should be able to push whatever you want to a branch, as long  
as your local branch is up-to-date.  If it's not working properly,  
there may be something wonky with your local repo.

michael

-- 
___________________________________
Michael Slusarz [slusarz at horde.org]