Code Symbiosis Programmers write a lot of code. Many programmers usually write even more code. Inevitably, people write code that conflicts with another person’s. There are a few ways to reconcile this so that the new can be combined with the new. A lot has been written about the tradeoffs of merging in changes versus rebasing off of the master branch. If you’re not familiar with
rebase
rebase
rebase
Code Symbiosis Programmers write a lot of code. Many programmers usually write even more code. Inevitably, people write code that conflicts with another person’s. There are a few ways to reconcile this so that the new can be combined with the new. A lot has been written about the tradeoffs of merging in changes versus rebasing off of the master branch. If you’re not familiar with