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

[Andre Dietisheim (JIRA)]

    [ https://issues.jboss.org/browse/JBIDE-14890?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12991182#comment-12991182 ] 

Andre Dietisheim commented on JBIDE-14890:
------------------------------------------

bumped to 4.3.x, https://bugs.eclipse.org/bugs/show_bug.cgi?id=372606 is still not fixed. 

We currently have to push force our "merged" existing project since we copy files around (EGit recursive merge wasnt available when we implemented this feature). This is suboptimal and we should offer our help to fix the EGit issue.

> Application wizard: 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, 4.1.1.Final
>            Reporter: Andre Dietisheim
>              Labels: application_wizard
>             Fix For: 4.3.x
>
>         Attachments: user-existing-project.png
>
>
> 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 was sent by Atlassian JIRA
(v6.2.6#6264)