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:
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.
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 masterThat 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.