#FORK OR GITHUB DESKTOP UPDATE#

If your local branch had unique commits, you may need to resolve conflicts. $ git merge upstream/main > Updating 34e91da.16c56ad > Fast-forward > README.md | 5 +++- > 1 file changed, 3 insertions(+), 2 deletions(-) For more information, see Basic Branching and Merging in the Git documentation. If your local branch didn't have any unique commits, Git will perform a fast-forward. $ git merge upstream/main > Updating a422352.5fdff0f > Fast-forward > README | 9 - > README.md | 7 ++++++ > 2 files changed, 7 insertions(+), 9 deletions(-) > delete mode 100644 README > create mode 100644 README.md This brings your fork's default branch into sync with the upstream repository, without losing your local changes. Merge the changes from the upstream default branch - in this case, upstream/main - into your local default branch. $ git checkout main > Switched to branch 'main' > From > * main -> upstream/mainĬheck out your fork's local default branch - in this case, we use main. > remote: Compressing objects: 100% (53/53), done. $ git fetch upstream > remote: Counting objects: 75, done. Commits to BRANCHNAME will be stored in the local branch upstream/BRANCHNAME. For more information, see ' Configuring a remote repository for a fork.'Ĭhange the current working directory to your local project.įetch the branches and their respective commits from the upstream repository. Syncing a fork branch from the command lineīefore you can sync your fork with an upstream repository, you must configure a remote that points to the upstream repository in Git. You can set the -force flag to overwrite the destination branch. If the changes from the upstream repository cause conflict then the GitHub CLI can't sync. gh repo sync owner/cli-fork -b BRANCH_NAME

#FORK OR GITHUB DESKTOP UPDATE#

To update the remote fork from its parent, use the gh repo sync -b BRANCHNAME subcommand and supply your fork and branch name as arguments. To learn more about GitHub CLI, see ' About GitHub CLI.' When you're working from the command line, you can use the GitHub CLI to save time and avoid switching context. GitHub CLI is an open source tool for using GitHub from your computer's command line. Syncing a fork branch with the GitHub CLI If the changes from the upstream repository cause conflicts, GitHub will prompt you to create a pull request to resolve the conflicts. Review the details about the commits from the upstream repository, then click Update branch.

On GitHub Enterprise Cloud, navigate to the main page of the forked repository that you want to sync with the upstream repository.Ībove the list of files, select the Sync fork dropdown menu.

Fork or github desktop