Post #2222467
2026-05-07 13:51 UTC
@Cykelero@mas.to @Retcon@indieapps.space An here I was eagerly waiting to see if it'd crash and burn when there's a conflict when cherry picking… I assume it won't but sadly it"s not part of the demo.
Replies (1)
-
@Cykelero@mas.to 2026-05-07 14:04
@michelf@iosdev.space That’s a good point; could be its own video! Retcon handles conflicts with grace: you’re never blocked from making further changes. So you can cherry pick, encounter a conflict, and just move the commit to the right spot to make the conflict go away. Or cherry pick another commit, or pull changes, etc: in Retcon, conflicts are road signs, not roadblocks.