{"thread":{"id":"13998","subject":"git & svn related merge questions ...","startedAt":"2008-06-17T11:28:53Z","lastAt":"2008-06-17T11:28:53Z","messageCount":1,"participants":["Saurabh Raje"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"80130","messageId":"loom.20080617T112816-101@post.gmane.org","threadId":"13998","inReplyTo":null,"subject":"git & svn related merge questions ...","fromName":"Saurabh Raje","fromEmail":"saurabh.raje@gmail.com","sentAt":"2008-06-17T11:28:53Z","receivedAt":"2008-06-17T11:28:53Z","isPatch":false,"sender":{"key":"saurabh.raje@gmail.com","avatar":null},"body":"Hi All,\n\nI have a question regarding 3-way merge ...\n\nHere's how the subversion commits had happened\n- Initially we had 'trunk' at revision T1\n- We made a 'branch' (svn cp) at revision B1 (T1 -> B1)\n(...development continues in trunk & branch...)\n- We merge (svn merge) changes T2 - T1 in branch B2 and resolve all the\nconflicts (if any) committing revision B3\n(...development continues in trunk...)\n\nAfter this I imported the entire subversion repository in Git (git-svn clone) &\nthen tried to merge the 'branch' (@B3) in 'trunk' (@T3).\n\nThe problem here is that the common ancestor is considered as T1 for 'trunk' &\nbranch' & not T2 which causes many more merge conflicts which should not have\nbeen there ... In subversion flow we used to merge diff of branch@B3 and\ntrunk@T2 in trunk to achieve the result with minimum conflicts.\n\nAny idea of how to fix this?\n\nI just started using Git. It is a fantastic piece of software.\nThank you all.\n\nRegards,\n\nSaurabh Raje \n"}]}