mortonfox

joined 1 year ago
[–] mortonfox@pawb.social 7 points 8 months ago

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.

[–] mortonfox@pawb.social 15 points 8 months ago (1 children)

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

[–] mortonfox@pawb.social 6 points 11 months ago

RIP Bram.

I've been using Vim for 3 decades under multiple OSes and I think this software has had the most impact on my daily workflow.