logoalt Hacker News

masklinntoday at 2:21 PM1 replyview on HN

I personally don’t care for rebasing in magit (I actually find it confusing when hitting conflicts).

My primary reason for using it is reviewing and staging commits. The non-linear staging with line granularity (which also lets you revert changes at the same time) is so, so very good when you care about crafting commits.


Replies

mschulzetoday at 2:25 PM

Right - actually, for conflicts I switch to IntelliJ.