Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cdt-dev] Git - apply patch to two branches

I am really not familiar with git, I need exact instructions, i.e.
- I apply patch on my workspace which is local branch cdt_8_0 pointing
to remote branch_8_0
- I commit my change locally
- Now what? How to do I merge this change master? What exact command I run?

On Mon, Jun 27, 2011 at 11:22 AM, Schaefer, Doug
<Doug.Schaefer@xxxxxxxxxxxxx> wrote:
> I would just do what we did with CVS. Merge the cdt_8_0 branch into master and push the resulting master once conflicts are resolved and tests pass.
>
> Mind you, I'm not certain we did that either. As the maintenance branch diverges from the main one, it gets riskier to merge. That's why I think Andrew's tip on cherry picking the commits from cdt_8_0 that we want in master (or vice versa) would be best, especially if it's done right after the commit goes in.
>
> Doug.
>
>> -----Original Message-----
>> From: laskava@xxxxxxxxx [mailto:laskava@xxxxxxxxx] On Behalf Of Alena
>> Laskavaia
>> Sent: Monday, June 27, 2011 8:11 AM
>> To: Schaefer, Doug
>> Cc: CDT General developers list.
>> Subject: 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
>> >
> _______________________________________________
> cdt-dev mailing list
> cdt-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/cdt-dev
>


Back to the top