git & svn related merge questions ...

Hi All,

I have a question regarding 3-way merge ...

Here's how the subversion commits had happened
- Initially we had 'trunk' at revision T1
- We made a 'branch' (svn cp) at revision B1 (T1 -> B1)
(...development continues in trunk & branch...)
- We merge (svn merge) changes T2 - T1 in branch B2 and resolve all the
conflicts (if any) committing revision B3
(...development continues in trunk...)

After this I imported the entire subversion repository in Git (git-svn clone) & then tried to merge the 'branch' (@B3) in 'trunk' (@T3).

The problem here is that the common ancestor is considered as T1 for 'trunk' & branch' & not T2 which causes many more merge conflicts which should not have been there ... In subversion flow we used to merge diff of branch@B3 and trunk@T2 in trunk to achieve the result with minimum conflicts.

Any idea of how to fix this?

I just started using Git. It is a fantastic piece of software. Thank you all.

Regards,

Saurabh Raje