minus-squareresponsible_sith@programming.devtoProgramming@programming.dev•Julia Evans' Git cheat sheetlinkfedilinkarrow-up3·1 month agoMaybe you resolved the conflict in the wrong way and want to restart after finishing the rebase. linkfedilink
minus-squareresponsible_sith@programming.devtoProgramming@programming.dev•Julia Evans' Git cheat sheetlinkfedilinkarrow-up6·1 month agoThat sounds like the perfect situation to use git worktree. linkfedilink
Maybe you resolved the conflict in the wrong way and want to restart after finishing the rebase.