
Best Practices
Dealing Faster with Conflicting Pull Requests
While we all have a different way of managing our GitHub workflow, we all have to deal with one annoying thing: conflict. When a pull request modifies a file that has been modified in the meantime, GitHub shows you the famous Resolve conflicts button. This indicates the pull request cannot