Tech Insights
Be carreful when using the **Resolve conflicts** button on github. For instance, if you're doing a PR from master to develop ...
Be carreful when using the Resolve conflicts 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.
Shared by
- Git
- Github
- Pull Request



