This message was deleted.

There’s likely a conflict on the upstack branch with what’s on main/downstack after rebase. Does fixing the conflict get you into a bad state?

Disregard — looks like

gt upstack submit

did the trick. Thanks!

I’d just double check that your state is correct via gt ls and no rebasing is required.

Yup looks good

Is that the order you expect? Based on your msg above it seems like skin* and new* are related?

No, unrelated. I was moving skin* away from new*

Next time you can do gt upstack onto <child> <new parent>

That’s what I did earlier when I started this process, which became like 20 rounds of rebase conflicts

sorry gt upstack onto <parent> while child is checked out

…gt ls and no rebasing is required

Is there a proper way to do that? Another member on my team merged his downstack branch, then did a rebase/restack from his next branch up in the stack, and then resulted in quite the mess

Not sure I fully grasp what happened. But you could do gt repo sync -r, which will then rebase non merged branches onto main. If you want to share the sequence of things that happened I can provide better advice

Yeah, I’m not sure we used the

-r

flag there. Does that make all the difference?

repo sync -r

is the same as running a restack command after syncing. if you’re running into having to address the same conflicts over and over again while rebasing, it may be simply due to the number of commits in the branch that had to be rewritten during the rebase…

git rerere

might be helpful for cases like this depending on the nature of the conflicts.

Thanks!