| 10 Jan 2025 |
 emily | up to you | 16:37:39 |
| emily | you can do stacked PRs in GitHub only if you can push branches directly to the repo :( | 16:37:55 |
| emily | (by directing one PR at another PR's branch; when the other PR is merged the target branch gets updated) | 16:38:06 |
 Randy Eckenrode | Isn’t there some weirdness with that if you aren’t targeting master with the first PR? We ran into that with the Darwin SDK stuff IIRC. | 17:19:44 |
| emily | I think that was because the PR was from your fork | 17:22:17 |
| emily | we just had a mirror branch set up but it turned out to not be enough | 17:22:23 |
| emily | but maybe staging could matter too? | 17:22:27 |
|  @sigmasquadron:matrix.org changed their display name from SigmaSquadron (Away until 2024-01-12) to SigmaSquadron (Away until 2024-01-11). | 22:15:41 |
| @sigmasquadron:matrix.org changed their display name from SigmaSquadron (Away until 2024-01-11) to SigmaSquadron (Away until 2025-01-11). | 22:43:10 |
| 11 Jan 2025 |
|  @orzklv:matrix.org left the room. | 04:07:51 |
|  Sinan (comfy) changed their profile picture. | 11:36:33 |
| @sigmasquadron:matrix.org changed their display name from SigmaSquadron (Away until 2025-01-11) to SigmaSquadron. | 15:06:32 |
 @marie:marie.cologne | i need some help with jj, I want to rebase some work to staging, I thought I could just do jj rebase -d staging, but that gives me Error: Commit 302c5392f503 is immutable. I tried a bunch of things, but I didn't figure out the correct thing. What do I need to do? | 16:11:26 |
| @marie:marie.cologne | 302c5392f503 is my local master bookmark where my work is on top | 16:12:44 |
 mjm | i'm guessing that master is not merged into staging, so it's trying to include that in the rebase | 16:13:03 |
| emily | perhaps pass -s <base commit of your work>. by default it will infer the stack to rebase from your current branch of work | 16:13:18 |
| mjm | you probably need -s to be more specific about which change to rebase | 16:13:16 |
| emily | which if you haven't pushed may not be accurate | 16:13:26 |
| emily | I would also suggest -d 'fork_point(master, staging)' when possible, so that you can test on a revision close to master that still merges into staging | 16:13:44 |
| emily | (this is the equivalent of the git merge-base suggestion in CONTRIBUTING.md) | 16:13:53 |
| mjm | woah there's a fork_point function in there? | 16:14:08 |
| mjm | i had written my own merge_base revset alias for that lol | 16:16:38 |
| @marie:marie.cologne | that seems to work thank you very much | 16:16:50 |
| @marie:marie.cologne | hm that does not seem to work for me, it gives me Error: Failed to parse revset: Function "fork_point": Expected 1 arguments | 16:17:20 |
| emily | you can omit the -s after git push -c basically. it's a little awkward, the default revset should maybe be a bit better | 16:17:29 |
| emily | ah, fork_point(master | staging) should do it | 16:17:36 |
| emily | (or the old-school heads(::master & ::staging) which I still use because of muscle memory) | 16:17:54 |
| @marie:marie.cologne | that worked! thanks | 16:18:16 |
| mjm | oh okay fork_point didn't exist when i added my version :D | 16:20:30 |
| emily | I wish it was called base(), I need to send a PR for that. (but getting off-topic I suppose) | 16:21:54 |
