how do i deal with multiple upstreams having the same name for a branch

[djugei]

i for a repo, clone it (this is the origin). i make some changes.
now the upstream changes, so i add it as a remote (upstream).
i intend to rebase my commits on top of the upstreams main (main@upstream) jj is now unhappy about there being 2-3 things called main: main@origin, local main, main@upstream. logically those are very different things, main@origin contains my changes.

i could create a new, differently named bookmark and use that to track my changes, but the pr is already opened and i do not want to loose the discussion.

anything that is simpler than, temporarily adding/removing the remote is appreciated.

[joyously]

What exactly does jj indicate about the names being the same?
How are these three main branches "very different" if you want to rebase from one to another?
You can easily branch from local main to a new branch to hold your changes, couldn't you?

[djugei]

they are very much different in the way i want to use them.

jj indicates them to be in conflict, my local branch main is trying to track both main@origin and main@upstream

[jennings]

In this situation, you should track main@origin but not main@upstream.

main and main@origin are logically the same branch: You expect to keep them in sync with each other.

But, you don’t intend to keep them in sync with main@upstream, at least not automatically. So, don’t track it. You can still fetch from upstream, which will move main@upstream, but not main.

When you want to rebase on top of upstream, use something like jj rebase -d main@upstream -b main.

i could create a new, differently named bookmark and use that to track my changes, but the pr is already opened and i do not want to loose the discussion.

If you want to be able to update main (and thus main@origin) before your PR merges, unfortunately I think you’re in a tough situation. Otherwise, I’m not quite sure what difficulty you’re running into, could you explain a bit?

[djugei]

oh yeah right i can just not track main@upstream.

i assumed i had to cause it does not show up in bookmarks, so i kinda assumed the commands would not recognize it.

but yeah i can just use x@upstream in commands no problem!

thanks!