Hi Michael,

sounds like you need (one way of viewing the steps required) to rebase the old series "take the total deltas " and apply that to a new branch taken from 'current branch (LocalMaster)'. This (rebase) will give you a clean copy of the series as patches (it is what rebase does beneath the covers), and add them to the new branch. (it depends on how you want to retain the old branch position - see later)


Once you have that rebased series in the new branch, you can merge it in (--no-ff) with a message about where the original series came from. (without the --no-ff it will just fast forward without a merge and that bit of history [the merge and it's message] will be 'lost'.)

If you really want to be cute, you can create an initial merge of the pr/p897 into local master with a faked --OURS policy, so as not to loose your original series, before doing the rebase, and then add the second merge of the --no-ff rebased history.

In the latter case the --first parent log should read ~~:
abc123 merge: rebased pr/897 series
def456 merge: original pr/987 series, pinned as second parent, using --OURS.
78code former tip commit: whatever...

Exactly how to do any fixup during the rebase is another story ;-)


That would be my thoughts about retaining the old as well as the new.

Hope it works for you..

Philip

----- Original Message ----- From: "Michael" <keybou...@gmail.com>
To: <git-users@googlegroups.com>
Sent: Tuesday, August 08, 2017 3:39 AM
Subject: [git-users] Adding a pull request (newer master) to my build


I'm looking for how to add a pull request, based off a newer master, to my master.

The specifics: I'm trying to work with OBS 18.0.2 (version 19 won't run on my older OS). I'm trying to add in a pull request (979, https://github.com/jp9000/obs-studio/pull/979 ) to my build.

That pull request is based on a nearly current master, so "git merge " tries to bring in all of master.

I've done this with other github stuff. I've got a version of youtube-dl, for example, that includes a few prosposed pull requests. Those don't give me trouble, because I keep updating master, and those pull requests don't add anything that gives me trouble.

This one? What I want seems pretty simple. I want to take the total deltas of this (origin/pr/979) since it left origin/master, and apply that to the current branch (LocalMaster).

How to do that, and keep it updated if that pull request is updated, is what I don't know how. In this case, it's unlikely to be updated, as it's already merged into the newest master. But in general, if I'm assembling a "frankenstein's monster" from pieces, how do I glue the pieces together?

---
Entertaining minecraft videos
http://YouTube.com/keybounce

--
You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to