message no. 180769
Posted by saml in #github at 2020-05-20T17:47:06Z
My pull request has conflicts. How can I simulate the conflict locally, and push changes to the branch so that PR won't have conflicts?
Posted by saml in #github at 2020-05-20T17:47:06Z