Conflicting pull requests are one of the most subtle yet tedious and exhausting problems when working on open source software. At first glance, it seems like a simple technical issue that can be solved with the git rebase or git merge commands. But in practice, this often hides not only technical difficulties, but also human …
Open about the difficulties of open source