[jbosstools-issues] [JBoss JIRA] (JBIDE-10171) OpenShift Express Use Case Scenario

[Max Rydahl Andersen (Commented) (JIRA)]

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

Max Rydahl Andersen commented on JBIDE-10171:
---------------------------------------------

turns out egit/jgit does not support recursive/OURS merge. http://www.eclipse.org/forums/index.php/mv/msg/261278/753913/#msg_753913 and https://bugs.eclipse.org/bugs/show_bug.cgi?id=354099

That leaves us in a bad place :(
                
> OpenShift Express Use Case Scenario
> -----------------------------------
>
>                 Key: JBIDE-10171
>                 URL: https://issues.jboss.org/browse/JBIDE-10171
>             Project: Tools (JBoss Tools)
>          Issue Type: Feature Request
>          Components: openshift
>            Reporter: Burr Sutter
>            Assignee: Max Rydahl Andersen
>            Priority: Critical
>             Fix For: 3.3.0.M5
>
>         Attachments: merge-with-unknown.png, not-compatible.png, selectable-examples.png
>
>
> Here is the workflow:
> 1) User starts with one of the 4 key archetypes (ee6  war, ee6 ear, springmvc, html5) to create a default application
> 2) deploys that app to a local JBoss instance to manually test
> 3) user sets up a New Server attached to an application at OpenShift Express
> 4) User now deploys the project created in step 1 above to the openshift express server
> And a related workflow:
> 1) User imports a pre-existing Maven project
> 2) Adjusts his dependencies for JBoss AS deployment
> 3) deploys and tests on a localhost version of JBoss AS7
> 4) Configures a OpenShift Server in the Servers tab
> 5) Deploys to Openshift

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira