Merge git repo into branch of another repo

by

You can’t merge a repository into a branch. You can merge a branch from another repository into a branch in your local repository. Assuming that you have two repositories, foo and bar both located in your current directory:

$ ls
foo bar

Change into the foo repository:

$ cd foo

Add the bar repository as a remote and fetch it:

$ git remote add bar ../bar
$ git remote update

Create a new branch baz in the foo repository based on whatever your current branch is:

$ git switch -c baz

Merge branch somebranch from the bar repository into the current branch:

$ git merge --allow-unrelated-histories bar/somebranch

(--allow-unrelated-histories is not required prior to git version 2.9)

More Related Contents:

  1. Definition of “downstream” and “upstream”
  2. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  3. Git – how to force merge conflict and manual merge on selected file
  4. SSL certificate rejected trying to access GitHub over HTTPS behind firewall
  5. Git 1.6.4 beta on Windows (msysgit) – Unix or DOS line termination
  6. Combining multiple commits before pushing in Git [duplicate]
  7. Git under windows: MSYS or Cygwin?
  8. Whitelisting and subdirectories in Git
  9. git push to multiple repositories simultaneously [duplicate]
  10. How do I make git block commits if user email isn’t set?
  11. Difference between git stash pop and git stash apply
  12. Merging between forks in GitHub
  13. Git – finding a filename from a SHA1
  14. git still shows files as modified after adding to .gitignore
  15. How to clone a specific Git tag
  16. Rollback a Git merge
  17. Git: Ignoring Version-Controlled Files
  18. What’s the easiest way to deploy a folder to a branch in git?
  19. Trouble setting up git with my GitHub Account error: could not lock config file
  20. How do I squash two non-consecutive commits?
  21. How do I select a merge strategy for a git rebase?
  22. What does tree-ish mean in Git?
  23. Why is git is ignoring files that aren’t in the .gitignore file?
  24. What are the consequences of using receive.denyCurrentBranch in Git?
  25. Unignore subdirectories of ignored directories in Git
  26. how to log out of one Github account and use another account?
  27. Duplicate submodules with Git
  28. How to display the tag name and branch name using git log –graph
  29. Why does zsh kills my process every time I enter a git command
  30. Git – Ignoring a specific modification to a config file

Leave a Comment