Hacker News Reader

If your fancy SaaS git repo thingy doesn't support merge queue's, maintain your own using the `--update-refs` option to git.

https://andrewlock.net/working-with-stacked-branches-in-git-...

View on HN

Oh, `--update-refs` is cool. I think this is what I want sometimes. I'll have a commit I want to test results of against branchA and branchB (e.g. I have `master` and `branchB` with two different implementations of some thing and I want to test some code in ref Y against it. Previously, I had to create a separate branch that was master+Y and branchB+Y and I might alter the branchB and have to rebase branchB+Y on it.

Actually I think it doesn't solve the problem now that I wrote it out, but it is interesting nonetheless.

Hmm, I think there may be some confusion. A merge queue != stacked branches.

yeah, it's really interesting, I've seen this confusion before

Sure, but we use a stacked branch to solve the same problem that a merge queue solves - preventing semantic merge conflicts by predetermining a merge order.

Reply on news.ycombinator.com