Upstream doesn't match the same default branch as current origin #3231
Replies: 1 comment
-
Good question! Git Town currently assumes that all branches have the same name in all remotes. That's because Git requires that tracking branches have the same name as local branches: The tracking branch of If there is a good use case, we can make this more flexible. Does your Also, just to be sure, can you please post the Git commands you run when you manually pull updates from |
Beta Was this translation helpful? Give feedback.
-
Was hoping to add upstream and then be able to run
git town hack
orgit sync
and essentially have it rebase or merge the upstream changes into the branch as well as origin main.However, the upstream doesn't have the same branch of
main
. Instead upstream hasdevelop
and origin hasmain
.Is there a way to configure this so the sync command works correctly? I've tried various ways with git config and branching commands, but git town seems to assume the upstream name is main and I can't get it to not do this.
Beta Was this translation helpful? Give feedback.
All reactions