Rebasing in Git
The day’s end dilemma
It’s the end of the day and everybody is anxious to get their code merged onto the integration branch and go home. Problem: everyone is trying to do this at the same time so it’s like the 7–1 lane merge at rush hour on the Lion’s Gate…