search

rock-core / base-doc

Rock's website
0 stars 11 forks source link

Tutorial "Configure component" - added section about dynamic properties #2

Closed charrius closed 10 years ago

charrius commented 10 years ago

Added a new chapter to the Rock tutorial "Configure components" - how to deal with dynamic properties.

charrius commented 10 years ago

Oups..there are some commits now accidentally "belonging" to this pull request because I pushed them on the same branch before the original pull request was accepted..

Can anyone tell me how I can issue several pull requests for the same branch before one pull request is accepted?

doudou commented 10 years ago

You unfortunately can't.

With pull requests, you really have to push them on temporary branches to avoid these kind of issues. If you have two sets of commits on the same branch, you either have to separate them using git rebase -i or you wait for the first pull request to be accepted before you create the second one.

I've done the "separate on two branches" technique for instance for rock-core/autoproj#15 and rock-core/autoproj#16. You basically create two branches from your current master and then filter the commits you want on each by doing git checkout branch1 git rebase -i autobuild/master

and removing the "pick" lines of the commits you do NOT want on branch1.

Sylvain

On Thu, Jul 17, 2014 at 6:54 PM, charrius notifications@github.com wrote:

Oups..there are some commits now accidentally "belonging" to this pull request because I pushed them on the same branch before the original pull request was accepted..

Can anyone tell me how I can issue several pull requests for the same branch before one pull request is accepted?

— Reply to this email directly or view it on GitHub https://github.com/rock-core/base-doc/pull/2#issuecomment-49333797.

goldhoorn commented 10 years ago

What's the state here?