-
> In Retcon, if a commit move results in a conflict, that doesn't matter; you can keep making changes to your history anyway, and then resolve any remaining conflicts when you're ready.
I wonder how similar your approach is to [jj's approach to conflicts](https://martinvonz.github.io/jj/latest/conflicts/); whether you reinvented the same way of modelling conflicts in the repo or use a different one. (See also the link to the technical docs from that page)
https://gitbutler.com/ also [borrowed this idea](https://blog.gitbutler.com/fearless-rebasing/) from jj.
-
SaaSHub
SaaSHub - Software Alternatives and Reviews. SaaSHub helps you find the best software and product alternatives
-
jj
Discontinued A Git-compatible VCS that is both simple and powerful [Moved to: https://github.com/jj-vcs/jj]
I'm just going to drop a casual shout-out to jujutsu[1]. It's 100% git-compatible—you can mix and match jj and git commands whenever needed, and your coworkers never need know you're using something else—but it elegantly solves things like rebase/merge conflicts (and solves a lot of other sharp edges in git at the same time).
It is one of those rare birds that is both more powerful than the tool that it replaces while also being drastically easier to use. I am (was?) a git power user, and it took me all of a day to replace git with jj, and the rest of the week to become essentially as fluent. I will never go back.
[1] https://github.com/martinvonz/jj
-
I'll add that while `jj` itself is a CLI, people have made GUIs on top of it that allow for drag and dropping of commits:
https://github.com/gulbanana/gg
