cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gaurav Aradhye <gaurav.arad...@clogeny.com>
Subject Re: How do the committers generally merge the pull requests?
Date Tue, 14 Apr 2015 13:07:40 GMT
Should I add this to any existing/new wiki page?

Regards,
Gaurav Aradhye

On Apr 14, 2015, at 6:34 PM, Gaurav Aradhye <gaurav.aradhye@clogeny.com> wrote:

> Thanks Sebastien for detailed steps!
> 
> Regards,
> Gaurav Aradhye
> 
> On Apr 14, 2015, at 6:30 PM, Sebastien Goasguen <runseb@gmail.com> wrote:
> 
>> 
>>> On Apr 14, 2015, at 2:53 PM, Gaurav Aradhye <gaurav.aradhye@clogeny.com>
wrote:
>>> 
>>> Need to some advice from established committers :-)
>>> 
>>> How do you merge the pull request? Through button on github? Or applying patch
locally and then committing it?
>>> Where to add “This closes ###” comment exactly?
>>> 
>>> Please help me out with steps!
>>> 
>>> Regards,
>>> Gaurav Aradhye
>>> 
>> 
>> personally I do this:
>> 
>> wget  https://github.com/apache/cloudstack/pull/166.patch
>> review patch manually
>> git apply —check….
>> 
>> then
>> 
>> git am -s < 166.patch
>> 
>> git rebase -i (to squash if needed and edit commit message…)
>> 
>> git commit —amend allows you to edit the commit message, that’s where you add
the “This closes #xyz” , remember to leave the original message…
>> 
>> git push
>> 
>> if applicable, make sure to cherry-pick to all branches concerned.
>> 
>> 
> 


Mime
View raw message