Hacker News Reader

Comment by switchbak | Hacker News Reader

I think Git's roots show in its lack of DX. But I'll take it over the horror that was SVN and prior tooling.

Question: how does Magit compare to GitUp? The latter is my benchmark for complex rebases, but I'd love to know if I'm stuck in a local optima.

View on HN

I've not used GitUp so I'm not sure how much help this will be to you since I can't objectively compare the two. As an example, let's say I want to remove some changes from a commit (and potentially move those into one or more different commits). If I go into the commit and select the chunks I want to revert, I can click `u` and right away I get the revert chunk added into my staging area AND the original chunk added to my working tree. Then I just fix-up the original commit (c F) to remove the unwanted change, and commit the original change - either in a few different commits or possibly just one.

> I think Git's roots show in its lack of DX. But I'll take it over the horror that was SVN and prior tooling.

This statement really confuses me. SVN was so much easier to use than git. It was incredibly straightforward: make changes, commit, done.

Merging branches was roughly the equivalent of git cherry-pick. There's tracking to prevent you from pulling the same commit twice, but not much else.

--reintegrate was introduced later, and even with that it was easy to get wrong.

I haven't used Magit or GitUp, but I really appreciate JetBrains IDE automatic conflict resolver.

Reply on news.ycombinator.com