P4merge for code diffs and merge. Their 3way merge tool is the best.
this post was submitted on 12 Aug 2023
428 points (95.9% liked)
Asklemmy
43971 readers
1074 users here now
A loosely moderated place to ask open-ended questions
Search asklemmy ๐
If your post meets the following criteria, it's welcome here!
- Open-ended question
- Not offensive: at this point, we do not have the bandwidth to moderate overtly political discussions. Assume best intent and be excellent to each other.
- Not regarding using or support for Lemmy: context, see the list of support communities and tools for finding communities below
- Not ad nauseam inducing: please make sure it is a question that would be new to most members
- An actual topic of discussion
Looking for support?
Looking for a community?
- Lemmyverse: community search
- sub.rehab: maps old subreddits to fediverse options, marks official as such
- !lemmy411@lemmy.ca: a community for finding communities
~Icon~ ~by~ ~@Double_A@discuss.tchncs.de~
founded 5 years ago
MODERATORS
Cisco IOS, although I suppose that's mostly because of the hardware. If there was actually an option, I'd probably run bsd or linux on my routers.
load more comments
(5 replies)
Serato DJ pro. No other software comes close. Mixxx is nice but I lose lots of features if I switch to it.
Clip Studio Paint. Preferred it overall compared to the free open source art programs I've tried, and there's a wide variety of user made brushes. Although I do hate how they changed their licensing in 2.0.