minus-squareresponsible_sith@programming.devtoProgramming@programming.dev•Julia Evans' Git cheat sheetlinkfedilinkarrow-up3·5 months 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·5 months agoThat sounds like the perfect situation to use git worktree. linkfedilink
minus-squareresponsible_sith@programming.devtoAsklemmy@lemmy.ml•What are some small, pocketable/keychainable items that are worth carrying everywhere you go?linkfedilinkarrow-up9·2 years agoWith ventoy you only need one. linkfedilink
Maybe you resolved the conflict in the wrong way and want to restart after finishing the rebase.