[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [cdt-dev] Git - apply patch to two branches
|
That was just me having two workspaces, which I don't like.
I still need to figure out how to do it
We almost almost need to merge everything from 8.0 to trunk.
How to do it properly? Can I just push from 8.0 to master/origin?
In general if I have a local branch, how to merge it back to master/origin?
On Sun, Jun 26, 2011 at 9:31 PM, Schaefer, Doug
<Doug.Schaefer@xxxxxxxxxxxxx> wrote:
> Good to see the patches applied! Thanks Alena!
>
>> -----Original Message-----
>> From: cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx]
>> On Behalf Of Alena Laskavaia
>> Sent: Sunday, June 26, 2011 12:53 PM
>> To: CDT General developers list.
>> Subject: [cdt-dev] Git - apply patch to two branches
>>
>> How to apply a patch to two branches? In CVS I was doing
>> - apply patch to trunk
>> - commit
>> - switch to branch
>> - apply patch
>> - commit
>> - switch to trunk
>>
>> I did a rebase to origin/cdt_8_0 - but I don't think it is right...
>> _______________________________________________
>> cdt-dev mailing list
>> cdt-dev@xxxxxxxxxxx
>> https://dev.eclipse.org/mailman/listinfo/cdt-dev
>
