Hacker News new | ask | show | jobs
by mupuff1234 240 days ago
But it's not that people don't grasp the concept of merge conflicts, it's just that the UX of git is bad.
1 comments

It's pretty great if you understand how to do resets, interactive rebases, understand the differences between merges and rebases, keep your commit history fairly clean, and just work with the tool. I haven't had a problem with Git since I spent a day going through the git book something like 10 years ago.

Meanwhile this is in a discussion about tools which people spend incalculable amounts of hours tuning, for reference. The number of articles on Hacker News about how people have tuned their LLM setups is... grand to say the least.