{"thread":{"id":"12111","subject":"Joining two development histories together and then splitting them back apart.","startedAt":"2008-02-15T05:41:00Z","lastAt":"2008-02-15T05:41:00Z","messageCount":1,"participants":["Pete/Piet Delaney"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"68797","messageId":"47B525EC.2090508@bluelane.com","threadId":"12111","inReplyTo":null,"subject":"Joining two development histories together and then splitting them back apart.","fromName":"Pete/Piet Delaney","fromEmail":"pete@bluelane.com","sentAt":"2008-02-15T05:41:00Z","receivedAt":"2008-02-15T05:41:00Z","isPatch":false,"sender":{"key":"pete@bluelane.com","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nHi:\n\nI thought I'd check on the right procedure for merging two branches and\nthen forking them off from that merged point. It's been a while since I\nset up git, I've been hacking on the kernel for a couple of months and\nnow want to merge it with our old CVS repository that I imported into git.\n\n\nFirst, on a remote machine I pull the repo and then check out a\ntracking branch; right? Ex:\n\n~  git clone git.bluelane.com:/home/git/blux\n\n~  git checkout -b engg origin/engg\n~  Branch engg set up to track remote branch refs/remotes/origin/engg.\n~  Switched to a new branch \"engg\"\n\n\nNow I'd like to merge it with another branch, which is kinda\nof like the master branch, but it's actually not the master/head.\nSo in my case I want to merge with origin/rel2_branch from the\nmaster git repo.\n\nSo as I recall I set up my .git/config with:\n\n\t[diff]\n~        \texternal = \"/usr/bin/kompare\"\n~        \trenames = true\n\n\t[merge]\n~        \ttool = \"/usr/bin/kdiff3\"\n\nNext I do a:\n\n\tgit-merge origin/rel2_branch\n\nhopefully kcompare will then pop up for the merge resolution.\n\n\nNow that the two branches are in sync I'd like to split the\ntwo branches and then push that up the the remote repository\nand hopeful all new changes to the engg branch will not be\nseen if someone pulls out the rel2_branch.\n\nI'm not sure if git will let me do all of this. I recall\nsome security stuff preventing the code from being easily\npush up to the top repository. Also I'm not sure if this\npart can be done in the local repo on my workstation.\n\nI suppose it will all start coming back to me as I mess\nwith it tomarrow.\n\nI thought it would likely be worthwhile to check with the git\nmailing list to get a few pointers to hopefully save some time\ntomarrow with the merge. I had the trees merged a few months\nago but the repo got a bit weird with my copying my merged\nrepo to the git repo and getting origins in the branch names\non the main repository.\n\n- -piet\n\n\n\n\n\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.7 (GNU/Linux)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niD8DBQFHtSXrJICwm/rv3hoRAmE5AJ96z755CwbwrUdHIENVUUEQk0xhEgCdE3TO\n8jFrAqYbWZsD00nKcZs+XJU=\n=Wtbg\n-----END PGP SIGNATURE-----\n"}]}