← Back to team overview

dhis2-devs-core team mailing list archive

Re: backporting in github

 

But i guess ultimately it depends on preference ;)

Ps: Pressed cmd enter too fast :P

On Sun, May 22, 2016 at 2:46 PM, Mark Polak <mark@xxxxxxxxx> wrote:

> I do something similar, but generally for the docs repo where there are no
> local dependencies. There isn't really a reason to keep the repo in a
> separate map..
>
> if you do a git pull it should update all your local branches in the same
> folder to do the cherry pick the only thing you'd really have to do is
>
> git branch 2.23
> git cherry-pick  <hash>
> git push (or git push origin 2.23)
> git branch master
>
>
> On Sun, May 22, 2016 at 1:42 PM, Jim Grace <jim@xxxxxxxxx> wrote:
>
>> Sounds good to me, unless someone knows a better way.
>>
>> On Sun, May 22, 2016 at 6:40 AM, Lars Helge Øverland <lars@xxxxxxxxx>
>> wrote:
>>
>>> Hi devs,
>>>
>>> as we use GitHub increasingly more we should find a standard way of
>>> "back-porting" commits to release branches, similar to how we do it on
>>> Launchpad.
>>>
>>>
>>> This is the procedure I use. This example uses the dhis2-docs repo.
>>> First clone the actual branch to avoid having to checkout/switch between
>>> branch and master all the time.
>>>
>>>
>>>    - git clone -b 2.23 git@xxxxxxxxxx:dhis2/dhis2-docs.git dhis2-docs-23
>>>
>>>    - cd dhis2-docs-23
>>>
>>>
>>> Then use *cherry-pick* to apply a commit from master to the branch and
>>> push to branch.
>>>
>>>
>>>    - git cherry-pick 3a6e47ea7a054f95967b3d0a0671fc649b7878c0
>>>
>>>    - git push origin 2.23
>>>
>>>
>>> I know there are multiple ways to do this. Let me know if this sounds
>>> okay or if there are better ways.
>>>
>>> Lars
>>>
>>>
>>>
>>>
>>>
>>>
>>> --
>>> Lars Helge Øverland
>>> Lead developer, DHIS 2
>>> University of Oslo
>>> Skype: larshelgeoverland
>>> lars@xxxxxxxxx
>>> http://www.dhis2.org <https://www.dhis2.org/>
>>>
>>>
>>> --
>>> Mailing list: https://launchpad.net/~dhis2-devs-core
>>> Post to     : dhis2-devs-core@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~dhis2-devs-core
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>>
>>
>>
>> --
>> Jim Grace
>> Core developer, DHIS 2
>> HISP US Inc.
>> http://www.dhis2.org <https://www.dhis2.org/>
>>
>> --
>> Mailing list: https://launchpad.net/~dhis2-devs-core
>> Post to     : dhis2-devs-core@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~dhis2-devs-core
>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>
>
> --
> Regards,
>
>
> Mark Polak
> Software developer, DHIS 2
> University of Oslo
> http://www.dhis2.org <https://www.dhis2.org/>
> mark@xxxxxxxxx
>



-- 
Regards,


Mark Polak
Software developer, DHIS 2
University of Oslo
http://www.dhis2.org <https://www.dhis2.org/>
mark@xxxxxxxxx

References