Git, merging and rebasing

[Simon Marlow]

On 10/05/2011 11:11, Roman Leshchinskiy wrote:
> Simon Marlow wrote:
>>
>> I'm not sure exactly what it means to rebase two branches "in sync".  I
>> know that if you rebase a branch and the target of the rebase already has
>> (some of) the patches that you are rebasing, then git will drop them
>> during the rebase.
>
> Ah, that's good to know. Thanks! So I could rebase the validate tree, push
> and then rebase the dev tree and that would work as expected?

Yes exactly, that's what I've been doing.

Cheers,
	Simon