Previous Thread
Next Thread
Print Thread
Joined: Oct 2019
Posts: 21
R
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?

Joined: Feb 2004
Posts: 2,217
Likes: 5
Very Senior Member
Online Content
Very Senior Member
Joined: Feb 2004
Posts: 2,217
Likes: 5
Rebase your work onto latest upstream.

Joined: Oct 2019
Posts: 21
R
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....)

Joined: Oct 2019
Posts: 21
R
Member
OP Offline
Member
R
Joined: Oct 2019
Posts: 21
Nevermind... I figured it out


Link Copied to Clipboard
Who's Online Now
0 members (), 32 guests, and 1 robot.
Key: Admin, Global Mod, Mod
ShoutChat
Comment Guidelines: Do post respectful and insightful comments. Don't flame, hate, spam.
Forum Statistics
Forums9
Topics8,882
Posts116,798
Members4,962
Most Online890
Jan 17th, 2020
Forum Host
These forums are hosted by www.retrogamesformac.com
Forum hosted by www.retrogamesformac.com