04-02-2016, 06:48 PM -
Unfortunately, my PR is still non-mergeable. See attached.
I see a bunch of updates on RPCS3/master that I don't have on my master. I would normally get these updates via merge, but since that is off the table due to rebasing, how do I get these updates?
I see a bunch of updates on RPCS3/master that I don't have on my master. I would normally get these updates via merge, but since that is off the table due to rebasing, how do I get these updates?