[jbosstools-issues] [JBoss JIRA] (JBIDE-14890) Use EGit recursive merge instead of copying git repository

[Andre Dietisheim (JIRA)]

Andre Dietisheim created JBIDE-14890:
----------------------------------------

             Summary: Use EGit recursive merge instead of copying git repository
                 Key: JBIDE-14890
                 URL: https://issues.jboss.org/browse/JBIDE-14890
             Project: Tools (JBoss Tools)
          Issue Type: Enhancement
          Components: openshift
    Affects Versions: 4.1.0.Beta2
            Reporter: Andre Dietisheim
            Assignee: Andre Dietisheim
             Fix For: 4.1.x


OpenShift tooling is working around missing recursive merge when importing into an existing Project ("use existing")

!user-existing-project.png!

When using the git command line one is told to merge by using the recursive merge startegy:

{code}
git merge -s recursive -X ours foo
{code}

When we created the JBoss Tools for OpenShift there was no recursive merge in EGit/JGit. We therefore worked around it by cloning the OpenShift repository and copying stuff over.
EGit 3.0 introduced the recursive merge strategy and put it to the default that's being used:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=380314#c22


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira