Previous Thread
Next Thread
Print Thread
Pull request without previous upstream merges #116299 10/29/19 04:20 PM
Joined: Oct 2019
Posts: 21
R
Robert Hildinger Offline OP
Member
OP Offline
Member
R
Joined: Oct 2019
Posts: 21
I have a MAME fork that I would like to issue a pull request for, but I have an upstream merge commit prior to the actual change that I want to have pulled. How do I make the pull request, but exclude the merge commit?

Re: Pull request without previous upstream merges [Re: Robert Hildinger] #116300 10/29/19 04:53 PM
Joined: Feb 2004
Posts: 2,081
Vas Crabb Offline
Very Senior Member
Offline
Very Senior Member
Joined: Feb 2004
Posts: 2,081
Rebase your work onto latest upstream.

Re: Pull request without previous upstream merges [Re: Vas Crabb] #116301 10/29/19 05:32 PM
Joined: Oct 2019
Posts: 21
R
Robert Hildinger Offline OP
Member
OP Offline
Member
R
Joined: Oct 2019
Posts: 21
Originally Posted by Vas Crabb
Rebase your work onto latest upstream.


Indeed, that is the part that I don't quite understand how to do...

I've done the following:

1. Created a fork of mame under my own github account
2. Cloned the fork in my workstation
3. Created a pull request a few days ago to update fork mame upstream, which resulted in a merge commit in my fork
4. Updated workstation clone
5. Applied all my code changes, and committed to workstation master branch
6. pushed changes upstream to fork

So my current changes are based on my_fork/master. I don;t understand how to rebase onto the latest upstream, and even if I did how would that work within the context of my fork?

(Sorry if these are stupid questions....)

Re: Pull request without previous upstream merges [Re: Robert Hildinger] #116302 10/29/19 06:22 PM
Joined: Oct 2019
Posts: 21
R
Robert Hildinger Offline OP
Member
OP Offline
Member
R
Joined: Oct 2019
Posts: 21
Nevermind... I figured it out


Who's Online Now
2 registered members (AJR, Cpt. Pugwash), 203 guests, and 3 spiders.
Key: Admin, Global Mod, Mod
ShoutChat Box
Comment Guidelines: Do post respectful and insightful comments. Don't flame, hate, spam.
Forum Statistics
Forums9
Topics8,712
Posts114,515
Members4,869
Most Online510
Aug 26th, 2019
Powered by UBB.threads™ PHP Forum Software 7.7.3