This forum uses cookies
This forum makes use of cookies to store your login information if you are registered, and your last visit if you are not. Cookies are small text documents stored on your computer; the cookies set by this forum can only be used on this website and pose no security risk. Cookies on this forum also track the specific topics you have read and when you last read them. Please confirm whether you accept or reject these cookies being set.

A cookie will be stored in your browser regardless of choice to prevent you being asked this question again. You will be able to change your cookie settings at any time using the link in the footer.

Thread Rating:
  • 0 Vote(s) - 0 Average
  • 1
  • 2
  • 3
  • 4
  • 5
How to handle Pull Requests
#11
Well, I finally figured out why I was having so many problems.

I kept using git pull to get updates from upstream (RPCS3/rpcs3) BUT that just does git fetch and git merge in sequence, and what I really wanted was git fetch and git rebase. Luckily, there is a way to do just that:

Code:
git pull --rebase upstream master

That fetches from upstream (assuming you have defined upstream in git remote) puts it on your master and plays your commits on top of the new updates. This ensures that A) no merge commits and B) your commits are always on top.

I'll edit my OP with this info.
Reply


Forum Jump:


Users browsing this thread: 2 Guest(s)