News for hackers. Stuff that matters.
Re:I (kind of) killed Mercurial at Mozilla by shepherdjerred on Tuesday November 21, 2023 @05:52PM (#38371673)
I've found that Graphite [0] has solved this issue for me. It's makes the experience of shipping stacked diffs about the same as the CR tool within AWS

[0]: https://graphite.dev/

Re:I (kind of) killed Mercurial at Mozilla by steveklabnik on Wednesday November 22, 2023 @01:33PM (#38383142)
Thanks for this. I admittedly still don't really grok it, but maybe if I play around with the tooling, something will click.
Re:I (kind of) killed Mercurial at Mozilla by shepherdjerred on Wednesday November 22, 2023 @02:49PM (#38384191)
I think that this page gives a decent overview of what the tool aims to accomplish: https://graphite.dev/docs/how-stacking-works

This page covers some of the more advanced functionality: https://graphite.dev/docs/manage-stacks

Either way, I hope you like it! I've tried many other tools that aim to implement stacked diffs for GitHub PRs, and Graphite is _by far_ the best. They have their own Web UI but I skip that completely and just use their CLI + GH's UI.

Re:I (kind of) killed Mercurial at Mozilla by steveklabnik on Wednesday November 22, 2023 @03:05PM (#38384411)
I watched their product overview video last night, but like, I don't grok what the difference between rebasing a branch and rebasing a stack is, and they said something like "if there are conflicts, this is when you'd fix them." but I thought the point was reducing conflicts. It sounds to me like short lived feature branches with a lot of extra terminology.

I really think I just need to actually try the tooling and then examine the git repo. I am very bottom-up brained when it comes to git, and so I need to visualize what commands actually do to the DAG to really grok what's going on.