{"thread":{"id":"23192","subject":"Git rebase/merge questions","startedAt":"2010-03-26T19:26:04Z","lastAt":"2010-03-26T19:26:04Z","messageCount":1,"participants":["Brian Dilley"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137882","messageId":"7a489efb1003261226h51a9576fq7c2d5de306da4b32@mail.gmail.com","threadId":"23192","inReplyTo":null,"subject":"Git rebase/merge questions","fromName":"Brian Dilley","fromEmail":"bdilley@estalea.com","sentAt":"2010-03-26T19:26:04Z","receivedAt":"2010-03-26T19:26:04Z","isPatch":false,"sender":{"key":"bdilley@estalea.com","avatar":null},"body":"    Recently i converted a very large CVS repository with a large\nnumber of modules, branches and tags to Git as we have decided we're\ngoing to migrate to Git.  At the same time there is some restructuring\nthat is going to be done.  We're actually splitting modules up into\nseparate Git repositories all together (not each module in it's own\nrepo, but grouping them a bit better).  Take these example CVS\nmodules:\n\nAproject1\nAproject2\nAproject3\nBproject1\nBproject2\nBproject3\n\nThey used to all be in the same repository but we're moving them into\ntheir own repositories:\n\ngit repo for A:\nAproject1\nAproject2\nAproject3\n\ngit repo for B:\nBproject1\nBproject2\nBproject3\n\nAnd furthermore we're renaming them:\ngit repo for A:\nxxx-project1\nxxx-project2\nxxx-project3\n\ngit repo for B:\nyyy-project1\nyyy-project2\nyyy-project3\n\nThere is also some other changes we're making that is more project\nspecific (upgrading from Maven 1 to Maven 2).  The plan has been:\n\n1) create Git repo - note date/time\n2) make rename/restructure changes\n3) make build system updates (maven1->mave2)\n4) copy all changes since step #1 from CVS into Git\n5) cut over to Git completely\n\nThere are several active branches in place for each of these modules.\nFor each branch we planned on executing those steps in that order.  So\nwhat I initially did was step 1.  Then step 2, 3 and 4 in \"master\".  I\nthen planned on merging these changes from master into each of the\nbranches one at a time, effectively completing step 2 and 3 at once.\nThis is where my problem lies.  I've tried the following on the\nbranches:\n\ngit rebase master\nthis results in a TONS of conflicts (why would there be conflicts?)\n\ngit merge master\nsame as above, TONS of conflicts\n\ni've tried branching from master from the comment before i peformed\nstep #2 on it, removing everything but the \".git\" directory, copying\neverything from one of the branches (from another directory) into the\nrepo directory and rectifying the deltas by adding the differences and\nnew files and removing the removed files and then committing this\nbranch.  The theory being that it's a copy of master with all of the\nchanges from the other specific branch and then doing the rebase/merge\n- still TONS of conflicts.\n\nMost of the conflicts are (delete/modify) conflicts.  I expected a few\nproblems (10-20) but i'm getting hundred and thousands.  Any help\nwould be greatly appreciated!\n"}]}