I Stopped Using GitHub (Kind Of)

Stacked diffs are definitely the future of git workflows, and I'm hyped I get to talk about them

S/O Ph4se0n3 for the awesome edit 🙏

[tdotgg]

Been using graphite nonstop since recording this and I’m even more sold. It feels like Tailwind when it clicks. Seriously y’all, I know it seems weird and scary at first but it is so much more pleasant

[Vim_Tim]

The suggestion of spending more money, and more importantly the ramp-up time of all team members, is basically a nonstarter for most teams where the current Git workflows work well and are well-understood. Still interesting to see new ideas in version control.

[chocolatemilk]

Yo this is already my GitHub flow. Stacking PRs, rebasing, force push for clean commit log. The one thing I hate is approving PRs one by one and having to make sure the order of my stacked PRs are approved in the right order. Also having to update a previous branch in the stack and then rebasing all the stack above it individually

Seems like this fixes this nuisance

Edit: After using it this morning I can fully conclude that this is the shit. I had a backlog of 9 branches that I had to stack into a PR. All I had to do was run `gt track` and choose the parent for each branch I made before using graphite. Then I ran `gt-ss` and it stacked all my branches into a stack of PRs. Amazing. It turned out I had forgot to push a branch to remote and Graphite found it and recommended for the child to to track it. Sick!

Cheers to the time save in the future

[brunocarvalho]

Sounds like 80% of this is just a couple of git commands that improve the mechanics of merging changes into remotely rebased branches

[ispepsi]

I have a hard time using GUI git tools and automated/abstracted commands for git operations and stick to using plain git cli. It took a while getting used to, and I'm not a git guru by far, I just feel more comfortable that way, rebasing, merging, cherry-picking, bisecting, hell, even patch adding, all on the git cli

[Corard]

I've only used Graphite for a couple of days but the stack diff workflow completely changed how I think about organising changes

[loganlandonline]

cool but 30 per dev per month is ....INSANE pricing

[Nurofn_]

I'm one dev shipping to 0 users, I'll add this to my tooling!

[mburakerman]

this is definitely much more complicated than github flow.
tell us theo how much did you get paid for this?

[mmattbtw]

idk microsoft word revision history is pretty crazy

[wata]

ehhhh not paying $30 a month for this LMAO

[andersreiche]

I mean.. Sure. But the workflows you are showcasing seems like a living hell to begin with. We should probably fix our processes so that we don't need to do stacked PR's in the first place.

[muhwyndham]

So basically graphite is automating rebase and force push. It's already my usual flow for 3 years now.

[setoichiii]

definitely going to be checking this out.

[neeeeeck]

I always felt like Git was just a low-level tool, prone to mistakes because of human factor. What we really lacked was high-level workflow automation thingy like this one you showed to us, which basically handles things we don't want to care about.

[binhify]

To be honest I trust you (at least for now) so idc if you're getting paid or not, but this looks awfully compicated and i'm not so sure if it actually solves any problem 🤔

[alanchung]

this reminds me a lot of the gerrit workflow

[DeanRTaylor]

It's interesting but it doesn't seem to drastically change anything, for most companies they're not going to pay for this and like react and other frameworks businesses will just go with what works and what is popular to make sure they can hire engineers.

This feels like you need to know git already and then use this which again doesn't really make it appealing since you can do pretty much all this in git.

[ventic]

The review UI looks like a significant improvement over github. I'm not so sure about the local workflow; I love my git worktrees and existing shell shortcuts. I do already conduct my work in terms of changes; the initial commit for a change usually comes before its branch.

I'm really curious how it handles the force pushes when you have someone else depending on your changes in their own changes and the new version you push causes a conflict with theirs. This has been the big pain point with force pushes in my experience and I don't see a clear way that Graphite could resolve that, being built on top of git still.

[TheSephix]

Hard to trust your opinion when you're sponsored