Remix.run Logo
killerstorm 2 hours ago

Yeah, also JetBrains IDEs like IntelliJ have very nice merge UI.

Perhaps the value of doing it on SCM level is that it can remember what you did. Git has some not-so-nice edge cases.