We rebase PR’s instead of merging them, that is why your commits from the other PR are also on this one. You can fix this by doing some rebasing or cherry picking but I can also fix that.
(For the next PR if you first pull and hard reset your master to the upstream master this should not happen anymore)
We rebase PR’s instead of merging them, that is why your commits from the other PR are also on this one. You can fix this by doing some rebasing or cherry picking but I can also fix that. (For the next PR if you first pull and hard reset your master to the upstream master this should not happen anymore)