Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Solution] Upstream renamed from master to main #320

Closed
wei opened this issue Apr 3, 2021 · 3 comments · May be fixed by #616
Closed

[Solution] Upstream renamed from master to main #320

wei opened this issue Apr 3, 2021 · 3 comments · May be fixed by #616

Comments

@wei
Copy link
Owner

wei commented Apr 3, 2021

With the default configuration, Pull will/might stop working when upstream renames their default branch from master to main, or any other name.

The easiest solution is to create a new branch called main like so:
image

With this change, Pull app will automatically pull in upstream's main to your main branch.

You can then set the main branch as your new default branch (optional).
@wei wei pinned this issue Apr 3, 2021
@wei wei mentioned this issue Apr 3, 2021
Closed
@ajhalili2006
Copy link

Will renaming the current branch to match the upstream repo's main branch work or do the app needs to do some algorithmic magic?

@wei
Copy link
Owner Author

wei commented Apr 22, 2021 •
edited
Loading

@AndreiJirohHaliliDev2006 Yes but Git does not "rename" branches. Whatever git application you use is probably creating a new branch and deleting the old one.

@wei wei closed this as completed Nov 3, 2021
Dustin4444 added a commit to Dustin4444/pull that referenced this issue Mar 13, 2025
@Dustin4444
Update documentation to inform users about manual configuration update
6a3f568 
Fixes wei#320

Add documentation and comments to handle upstream branch renaming.

* **README.md**
  - Add a section to inform users about the need to manually update the configuration file when the upstream branch is renamed.
  - Provide an example of how to update the `upstream` field in the configuration file to reflect the new branch name.

* **src/utils/get-pull-config.ts**
  - Add a comment to indicate that the function does not handle branch renaming.

* **.devcontainer/devcontainer.json**
  - Add a devcontainer configuration file with build and test tasks.

---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/wei/pull/issues/320?shareId=XXXX-XXXX-XXXX-XXXX).
@Dustin4444 Dustin4444 mentioned this issue Mar 13, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Update documentation to inform users about manual configuration update Dustin4444/pull
4 participants
@wei @ajhalili2006 and others