Uploaded image for project: 'Tools (JBoss Tools)'
  1. Tools (JBoss Tools)
  2. JBIDE-14890

Application wizard: Use EGit recursive merge instead of copying git repository

    XMLWordPrintable

Details

    • Medium

    Description

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

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

      git merge -s recursive -X ours foo

      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

      Attachments

        Issue Links

          relates to

          Bug - A problem that impairs or prevents the functions of the product. JBIDE-17740 Application wizard: Cannot deploy git-based project to OpenShift

          • Blocker - To be worked above all other priorities. This term is chosen when the severity of the issue is very high, has no workaround, or the effort for the change is comparatively low. Issues that may be very publicly visible and could generate significant media attention may also drive a higher priority.
          • Closed

          Enhancement - An enhancement to or refactoring of existing functionality that is not configurable by an end user (typically a change made by an internal team that affects users) JBIDE-17831 Application wizard: dirty project should not be selectable as existing project (validate before starting to merge openshift app into existing proj and fail)

          • Optional - The request should be considered desirable but is not an immediate necessity.
          • Closed

          Enhancement - An enhancement to or refactoring of existing functionality that is not configurable by an end user (typically a change made by an internal team that affects users) JBIDE-17848 Application wizard: dirty project should not be selectable as existing project (validate before starting to merge openshift app into existing proj and fail)

          • Optional - The request should be considered desirable but is not an immediate necessity.
          • Closed

          Activity

            People

              adietish@redhat.com André Dietisheim
              adietish@redhat.com André Dietisheim
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: