What fresh hell is THIS now? - Patrick Lauke
master
, cherry-pick commits that you authored specifically (without “merge” commits), and then squash them into a single commit. This way the PR will be much cleaner. (Just FYI, to avoid merge commits when you’re pulling latest changes from upstream in future, you can do git pull —rebase
.)
<span aria-label="16">XVI</span>
would probably be the simplest fix