Monorepo for Tangled tangled.org
856
fork

Configure Feed

Select the types of activity you want to include in your feed.

Stacked PR's with JJ don't allow a shared change #335

open opened by mikeclayton.tngl.sh

I was playing around with JJ and the stacked PR feature where I wanted to see if I could do something where two different PR's share a parent change. For example I have change A, I commit B, then branch off B to both C and D. Pushing from both C and D do create a stack of PRs, but it looks like a new commit is generated for B for both children. So when I merge C's B PR, that's no reflected on D's PR.

I'm not sure if the issue is in how Tangled deals with these PR's, or something todo with how JJ works. I've had plenty of pain with JJ trying to do things I would consider basic in git and things falling over.

I have recreated the situation on https://tangled.org/@mikeclayton.tngl.sh/test2/pulls

@  xszmlszp mike@clayton.tech 2025-09-23 21:30:18 child-2 90c15318
│  child change 2
│ ○  lxvpzpmx mike@clayton.tech 2025-09-23 21:29:52 child-1 push-lxvpzpmxxqnw 96dc050c
├─╯  child change 1
○  uknpqnoq mike@clayton.tech 2025-09-23 21:29:32 7779427e
│  parent change

I've updated my config.toml like suggested in https://blog.tangled.org/stacking and I'm using JJ 0.33.0.

[deleted by author]

Makes sense, want me to close it or do you think it's usefull info for that proposal?

because we use git-am to apply a PR internally

Is this the reason why my commits are market as divergent when I merge them using tangled UI? Is there any workaround other than jj abandon after the merge?

sign up or login to add to the discussion
Labels

None yet.

assignee

None yet.

Participants 3
AT URI
at://did:plc:ufgdpugs72xribnbu66ux5qt/sh.tangled.repo.issue/3lzjriczd2222