The following warnings occurred:
Warning [2] Undefined property: MyLanguage::$archive_pages - Line: 2 - File: printthread.php(287) : eval()'d code PHP 8.2.28 (Linux)
File Line Function
/inc/class_error.php 153 errorHandler->error
/printthread.php(287) : eval()'d code 2 errorHandler->error_callback
/printthread.php 287 eval
/printthread.php 117 printthread_multipage



EmuNewz Network
How to handle Pull Requests - Printable Version

+- EmuNewz Network (https://www.emunewz.net/forum)
+-- Forum: Official Boards for Emunews Affiliated Emu Projects (https://www.emunewz.net/forum/forumdisplay.php?fid=47)
+--- Forum: Official RPCS3 Forum [archive] (https://www.emunewz.net/forum/forumdisplay.php?fid=172)
+---- Forum: RPCS3 - General Discussion (https://www.emunewz.net/forum/forumdisplay.php?fid=164)
+---- Thread: How to handle Pull Requests (/showthread.php?tid=174438)

Pages: 1 2

RE: How to handle Pull Requests - markus - 04-07-2016

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.