<p>Be carreful when using the <strong>Resolve conflicts</strong> button on github. For instance, if you're doing a PR from master to develop and resolve the conflicts, it will commit the merge on master even if it's protected.</p>
By clicking “Accept all”, you agree to the storing of cookies on your device to enhance site navigation, analyze site usage and assist in our marketing efforts. Check our privacy policies.