Morton Fox

I use rebase when I’m working in a dev branch. If someone else has pushed changes to the main branch, rebasing the dev branch on top of main is a way to do the hard work of resolving merge conflicts up front. Then I can rerun tests and make sure everything still works with changes from the main branch. And finally, when it is time to merge my dev branch to main, it’s a simple fast-forward.

That picture makes me nervous. What if someone else is coming from the other direction?

To me, the culture shock would be that there is a bicycle that costs $15K

The ones that get me are captchas saying select all squares with motorcycles when it is clearly a bicycle.