Merging two remote repositories in Git

by

I would recommend:

  • cloning yourRemoteRepo (that way, you can easily pull/push from that repo)

  • adding mainstreamRepo as a remote and fetch its branch, then track the one which interest you

    git clone git://yourRemoteRepo
git remote add mainStreamRepo http://mainStreamRepo
git fetch mainStreamRepo
git checkout -b mainStreamMaster mainStreamRepo/master
git checkout master

From there, you can

  • merge mainStreamMaster to your master,
  • or rebase your master on top of mainStreamMaster (in order to integrate the full history of mainStreamMaster into your master branch)
  • then make some evolutions to master (or to a topic-specific branch) that you can push to yourRemoteRepo.

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. Undo a Git merge that hasn’t been pushed yet
  3. When do you use Git rebase instead of Git merge?
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. Have Git Select Local Version On Merge Conflict on a Specific File?
  6. How can I selectively merge or pick changes from another branch in Git?
  7. Git workflow and rebase vs merge questions
  8. Why does git perform fast-forward merges by default?
  9. Git merge left HEAD marks in my files
  10. Resolve Git merge conflicts in favor of their changes during a pull
  11. How can I merge two commits into one if I already started rebase?
  12. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  13. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  14. git remove merge commit from history
  15. tell git to use ours merge strategy on specific files
  16. git merge, keep both
  17. Merge development branch with master
  18. How can I preview a merge in git?
  19. How can I configure KDiff3 as a merge tool and diff tool for git?
  20. Is it possible to pull just one file in Git?
  21. How do I fix a merge conflict due to removal of a file in a branch?
  22. Sharing rerere cache
  23. Restart/undo conflict resolution in a single file
  24. Is there a git-merge –dry-run option?
  25. git: merge two branches: what direction?
  26. Git merge doesn’t use default merge message, opens editor with default message
  27. Telling if a Git commit is a Merge/Revert commit
  28. Git merge branch into master
  29. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment