🪴/ Branchless or Stacked git workflows

I heard about the Stacking Git Workflow and went running with Graphite:

Graphite - The end-to-end developer platform graphite.dev

Graphite helps teams on GitHub deliver higher quality software, faster.

I've enjoyed it for a good bit, it's got a useful VSCode extension and a CLI that allows you to create a GitHub PR per commit, breaking a series of changes into easily reviewable PRs. They've started requiring a subscription though, which I'm not interested in especially since I'm using this flow on my own, my coworkers don't care that I'm using Graphite.

While looking for a new solution on https://www.stacking.dev, I was reminded that jj exists, a new VCS that has convenient Git compatibility, even to the point of being backed by a Git repository, with plans for alternative servers in the future.

I read through https://v5.chriskrycho.com/essays/jj-init/ again, and installed the tool and followed the basic instructions in the official docs before moving on to Steve Klabnik's Jujutsu Tutorial which was pretty solid and helpful at getting me to understand the tool, and, important to my purposes, how to use it to generate vanilla git branches and push them to GitHub.

It's working well, I appreciate the auto-rebasing of branches and novel approaches to tracking changes and resolving conflicts, though I really wish VSCode's merge editor had support for the jj conflicts.

I messed around with https://github.com/gulbanana/gg, though I'm more comfortable with the CLI tool atm.

Going to try to work out how to use sunshowers' fork of spr that supports jj:

Otherwise, I'll keep this list of other git stacking workflow tools and tips around:

• https://gitup.co
• https://github.com/arxanas/git-branchless
• https://martinvonz.github.io/jj/v0.12.0/github/#using-a-generated-branch-name
• https://graphite.dev
• https://abhinav.github.io/git-spice/