[githelp] Pulling to arbitrary branch?

Rene Rivera

29 Dec 2014 29 Dec '14

3:56 p.m.

I have a pull request against one branch (master). But I want to pull it into a different branch (develop). Is that possible? And if so, how? -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail

Show replies by date

Vladimir Prus

29 Dec 29 Dec

4:06 p.m.

On 12/29/2014 06:56 PM, Rene Rivera wrote:

...

I have a pull request against one branch (master). But I want to pull it into a different branch (develop). Is that possible? And if so, how?

You can pull it manually - the pull request page has instructions. Could you give the URL of the pull request, so that I can provide specific instructions? -- Vladimir Prus CodeSourcery / Mentor Embedded http://vladimirprus.com

Rene Rivera

4:09 p.m.

On Mon, Dec 29, 2014 at 10:06 AM, Vladimir Prus wrote:

...

On 12/29/2014 06:56 PM, Rene Rivera wrote:

...
I have a pull request against one branch (master). But I want to pull it into a different branch (develop). Is that possible? And if so, how?

You can pull it manually - the pull request page has instructions.

OK, good.. Could you give the URL of the pull request, so that I can provide specific

...

instructions?

It's this one: https://github.com/boostorg/predef/pull/17 -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail

Vladimir Prus

4:39 p.m.

On 12/29/2014 07:09 PM, Rene Rivera wrote:

...

On Mon, Dec 29, 2014 at 10:06 AM, Vladimir Prus wrote:

...
On 12/29/2014 06:56 PM, Rene Rivera wrote:

...
I have a pull request against one branch (master). But I want to pull it into a different branch (develop). Is that possible? And if so, how?

You can pull it manually - the pull request page has instructions.

OK, good..

Could you give the URL of the pull request, so that I can provide specific

...
instructions?

It's this one: https://github.com/boostorg/predef/pull/17

Okay, then switch to devel locally, and do this: git fetch https://github.com/jessicah/predef.git feature/haiku-support git merge --no-ff FETCH_HEAD git push Somewhat better approach is: git fetch https://github.com/jessicah/predef.git feature/haiku-support git cherry-pick FETCH_HEAD^ git cherry-pick FETCH_HEAD git push This will apply two comments in the pull request individually, making nicer history. (I don't know how to perform these actions in any GUI) HTH, -- Vladimir Prus CodeSourcery / Mentor Embedded http://vladimirprus.com

Rene Rivera

5:33 p.m.

On Mon, Dec 29, 2014 at 10:39 AM, Vladimir Prus wrote:

...

On 12/29/2014 07:09 PM, Rene Rivera wrote:

...
On Mon, Dec 29, 2014 at 10:06 AM, Vladimir Prus < vladimir@codesourcery.com> wrote:

On 12/29/2014 06:56 PM, Rene Rivera wrote:

...
I have a pull request against one branch (master). But I want to pull it

...
into a different branch (develop). Is that possible? And if so, how?

You can pull it manually - the pull request page has instructions.

OK, good..

Could you give the URL of the pull request, so that I can provide specific

...
instructions?

It's this one: https://github.com/boostorg/predef/pull/17

Okay, then switch to devel locally, and do this:

git fetch https://github.com/jessicah/predef.git feature/haiku-support git merge --no-ff FETCH_HEAD git push

Somewhat better approach is:

git fetch https://github.com/jessicah/predef.git feature/haiku-support git cherry-pick FETCH_HEAD^ git cherry-pick FETCH_HEAD git push

This will apply two comments in the pull request individually, making nicer history.

Did the latter since I like nicer histories always. It worked great :-) One issue I noticed though is that it doesn't show the merge on the graph (from the pull branch to the develop branch). But I guess that understandable. Thanks.. for your git-fu knowledge. -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail

Vladimir Prus

6:27 p.m.

On 12/29/2014 08:33 PM, Rene Rivera wrote:

...

...
Somewhat better approach is:

git fetch https://github.com/jessicah/predef.git feature/haiku-support git cherry-pick FETCH_HEAD^ git cherry-pick FETCH_HEAD git push

This will apply two comments in the pull request individually, making nicer history.

Did the latter since I like nicer histories always. It worked great :-) One issue I noticed though is that it doesn't show the merge on the graph (from the pull branch to the develop branch). But I guess that understandable.

It's either one or another. Git only records complete merges of tree states, it does not record cherry-pick. So if you prefer nicer history in case of small pull requests, you get no merge arcs. It seems fine to me, it's part of having nicer history for small changes. -- Vladimir Prus CodeSourcery / Mentor Embedded http://vladimirprus.com

3604

Age (days ago)

3604

Last active (days ago)

List overview

Download

5 comments

2 participants

participants (2)

Rene Rivera
Vladimir Prus