Merging between forks in GitHub

by

You probably have a “remote” for each repository. You need to pull from one remote and push to the other.

If you originally cloned from your fork, that remote will be called “origin”. If you haven’t added it already, you’ll need to add the other repository as another remote:

git remote add <shortname> git://github.com/<ownerName>/repo.git

After that’s all set up, you should indeed be able to (github changed default branch from master to main, change as necessary)

git pull <shortname> master
git push origin

Remember, git pull is nothing more than a macro that does git fetch and git merge, in that order. You just need to fetch the list of commits from the other repository and then merge his branch into your tree. Merging should do the right thing with your commits on both branches.

GitHub, in all its perpetual awesomeness, gives you a shortcut, of course. There’s a “fast-forward” button on your fork of the repository that you can use to catch your fork up if you’re entirely merged into the other side.

More Related Contents:

  1. How can I remove a commit on GitHub? [duplicate]
  2. Git commands that could break/rewrite the history
  3. Pull new updates from original GitHub repository into forked GitHub repository
  4. Git submodules in .gitmodules not initialized
  5. Updating a local repository with changes from a GitHub repository
  6. Github: error cloning my private repository
  7. Github remote push pack size exceeded
  8. How to update a pull request from forked repo?
  9. Push origin master error on new repository
  10. TortoiseGit save user authentication / credentials
  11. Why is “origin/HEAD” shown when running “git branch -r”?
  12. How do I push to GitHub under a different username?
  13. How to avoid merge-commit hell on GitHub/BitBucket
  14. Create a tag in a GitHub repository
  15. Create a GitHub repository from command line
  16. How to remove big (>100MB) file from a GitHub repository and push successfully?
  17. How to change my Git username in terminal?
  18. How do I get git to default to ssh and not https for new repositories
  19. What is “git remote add …” and “git push origin master”?
  20. In Jenkins, how to checkout a project into a specific directory (using GIT)
  21. How to sync changes on my local server with the ones on the remote one without commiting?
  22. Change date of git tag (or GitHub Release based on it)
  23. Git : fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
  24. Squash all my commits into one for GitHub pull request [duplicate]
  25. Permission denied error on Github Push
  26. How to pull a pull request quickly locally
  27. Git – How to auto push changes in a directory to another branch
  28. git export from github remote repository
  29. Do GitHub and GitLab support git clone’s –filter parameter?
  30. Why does ‘git commit’ not save my changes?

Leave a Comment