Merging Git Repositories
ฝัง
- เผยแพร่เมื่อ 24 ก.ค. 2024
- You know how to merge branches. But what if you want to merge two repositories keeping the history of commit in both. This video will show you a quick way to do that with git.
- วิทยาศาสตร์และเทคโนโลยี
Thank you for the helpful guide/tutorial. I couldn't remember all those commands. So I think it would be useful to sum it up for others here again: 1.) git remote add 2.) git fetch 3.) check to see whether remote is available with git remote -v 4.) Create a new branch with git checkout -b 5.) move all the files into a subdirectory so there aren't any conflicts with names (git mv) and commit that (git commit -m "moved") 6.) git checkout master 7.) git merge --allow-unrelated-histories 7.) cleanup everything with: git remote rm git branch -d 8.) check to see whether everything is correct with: git remote -v git branch -a -v git status 9.) git push
Very useful tutorial. Just little update: since Git v2.9 you have to use: 'git merge bootcamp --allow-unrelated-histories'
Many thanks for this video Juriy!
The following command will move all files and folders to the new folder:
git mv -k * nodecamp/
The -k flag will skip any action that contains an error condition (such as moving the target directory to itself).
I also used -n to dry-run to double check the files it will rename. After using git mv -k * nodecamp/ (or whatever directory) I had to manually mv the .gitignore
finally, finally and finally I got my solution to my problem. I'm that much happy I can't describe it. I know this problem is not that much big for some guys, but it's really very important for me because I am hustling since last week to find the answer to my query but now from this video, I got my answer. Thanks a lot, sir for this tutorial. I'm really grateful to you. Thank you so much, sir.
Very clear and helpful, even 5 years later! Thank you so much!
Even 8
Great video, concepts well explained and a great walk through. Thanks!
Hi Juriy,
Thanks for the tutorial. It was very helpful and connected the dots I was missing.
Very useful! Thanks :)
Btw: the command to select and move all files inside a folder just type "mv * newFolderName" (without quotes).
To move everything in new folder without the "fatal: can not move directory into itself", you can use "git mv -k * ./subDir". The "-k" option will simply skip all actions that would produce an error, like trying to move "/subDir" inside itself.
Seems like it does not work on windows
Never mind, can be done via Git Bash
Nice tutorial. Many many thanks.
This is a great video Juriy
I'm having already existing Repository with a directory inside it. So whenever I try to add another Directory to the same Repository using git it gets overwritten, what should I do.
You r the best :)
Hi Juriy!
I synced the repos successfully by following the steps shown in the video. Is there any way through which we can do the same without making a commit id for the merge operation. In the above method a commit id is generated (I wish if that can be done without that ID).
I explored other methods like post-commit hooks that can be an answer to my query. Any links will be helpful.
Thanks!
Hi! I'm not quite sure I understood your question correctly. Whenever you do "merge" git will create a new commit, unless this is a fast-forward merge. Also, since git's commit ID is a hash of commit content (including author, time and message) you don't have a control over ID generation. It is just SHA-1.
Could you explain what exactly you want to achieve, I'll try to give a better suggestion.
When moving all files to nodecamp folder, losing the history
Which git version you are using here
Or any alternative you can suggest to move files into nodecamp without losing history
Уж и забыл старый дизайн гитхаб, сколько лет уж прошло, Юрец...
HI Juriy,
In Github I have 1 working repository (2 branches Dev/QA) and 1 main repository(multiple branches ) .Main repo is your backbone and from here code goes to UAT.
I need something like pull request between to repository ,so i can compare there branches and merge it to my main repository ...
Appreciate your help.
Thanks.
If you don't have something like github or gitlab then "pull requests" between repositories will be quite tricky. Check out git-reqeust-pull command. git-scm.com/docs/git-request-pull. However this looks like an overly complex solution to me. I would suggest to use a backend like GitHub, Bitbucket or GitLab to manage pull requests for you.
Thanks for replying.
I'm using GitHub for remote repo.
In single repo able to create pull request.But how to compared 2branches of 2 different repository?
Starts at 1:42 when Juriy starts merging "nodecamp" repository into "trainings"
5:20 when i have to move all files in ./ a create one level up a folder : mkdir ../ ; mv ./* ../ ; mv ../ ./
Hi, Juriy. Awesome video, can you please tell me if the commits remain in history, as an example: I made an complex application in 2021 and I made like 500 commits, do they remain saved in commits history?
mv $(ls -1a |grep -v nodecamp | grep -vw \.) nodecamp