#Github get fork on desktop update

For more information, see ' Addressing merge conflicts. 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. All of this works as far as it goes, but it doesn't create a fork of the original project, meaning there's no obvious (to a newbie) way. Then you add a remote to your Github repository so you can push your changes to your repository. gh repo sync owner/cli-fork -b BRANCH_NAME On your local machine you add a remote to the original Octopress repository and then issue a 'git pull' command.

#Github get fork on 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. Merging another branch into your project branchĬlick Choose a branch to merge into BRANCH.Ĭlick the branch you want to merge into the current branch, then click Merge BRANCH into BRANCH.On GitHub, 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. For more information, see ' Addressing merge conflicts.' Resolve any merge conflicts in your preferred way, using a text editor, the command line, or another tool. To pull any commits from the remote branch, click Pull origin or Pull origin with rebase. To check for commits on the remote branch, click Fetch origin In GitHub Desktop, use the Current Branch drop-down, and select the local branch you want to update. For more information, see ' About Git rebase' and ' Rebasing your project branch onto another branch.' Pulling to your local branch from the remote By rebasing you can reorder, edit, or squash commits together. Some workflows require or benefit from rebasing instead of merging. For more information, see ' Merging another branch into your project branch' and ' About pull requests.' To request that changes from your branch are merged into another branch, in the same repository or in another repository in the network, you can create a pull request on GitHub Desktop. To apply changes to your branch from another branch in the same repository, you can merge the other branch into your branch on GitHub Desktop.

To add changes from one branch to another branch, you can merge the branches. For more information, see ' Pushing changes to GitHub from GitHub Desktop.' To update your branch on GitHub, you must push your changes. When you pull to your local branch, you only update your local copy of the repository. If you make commits from another device or if multiple people contribute to a project, you will need to sync your local branch to keep the branch updated. You can sync your local branch with the remote repository by pulling any commits that have been added to the branch on GitHub since the last time you synced.