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.
Morton Fox
- 0 Posts
- 13 Comments
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.
Vim, with grip for previewing in a web browser.
You could use a web browser. Just navigate to docs.python.org
Morton Fox@pawb.socialto
Android@lemmy.world•So, what's stopping you from getting a foldable? [Poll]English
6·3 years agoThe price, obviously. However, I’d also worry about the screen cracking where it folds.
Thank goodness, although I usually read the docs in devdocs.io, which has a dark theme.
I use SEE Finance.
GnuCash looks like it could be a good open source alternative but I haven’t gotten around to switching to it yet.
Morton Fox@pawb.socialto
Free and Open Source Software@beehaw.org•Message from the family of Bram Moolenaar
6·3 years agoRIP 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.
Morton Fox@pawb.socialto
Android@lemmy.world•Now that Sync and Infinity are out, which do people prefer? Also, how do they compare to the existing lemmy apps?English
19·3 years agoI’m using Sync, while waiting for Boost.
Morton Fox@pawb.socialtoExperienced Devs@programming.dev•How do you manage your dotfiles?
1·3 years agoI use yadm. It’s a wrapper around git with a few extra commands for dotfile management.







I’ve had thumb key installed on my phone for quite a while but didn’t switch because it was missing some of messagease’s features. Maybe this subscription nonsense will be the push I need to make a permanent switch.