1220
A classic
(sopuli.xyz)
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 26 Aug 2023
1220 points (98.5% liked)
Programmer Humor
32481 readers
317 users here now
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
- Posts must be relevant to programming, programmers, or computer science.
- No NSFW content.
- Jokes must be in good taste. No hate speech, bigotry, etc.
founded 5 years ago
MODERATORS
If you use vscode, try out the merge editor. It's a lot clearer to me when the merge diffs are huge.
I would also say to check out the latest branch for each file you commit. If your file is file.tsx checkout file.tsx in the main branch to make sure you know what you're changing.
Thanks! I've been tinkering with VS Code (migrating from IntelliJ) recently - I've found that they're at pretty-much feature parity. VS Code makes it much harder to attach a debugger (IME, though I might just not grok it yet), but is more customizable and a lot less of a memory-hog. I think I'm comfortable adopting it as my daily driver. And, as you say, any IDE's Merge Editor is usually clearer than the equivalent direct from the CLI!
However, I wasn't complaining about Merge Conflicts - I do dislike them, but they're a necessary evil (well, until AI can resolve all conflicts itself :P ). Rather, I was complaining about Merge Commits. See my comment here for more context.