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

    • Medium

      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

        1. user-existing-project.png
          user-existing-project.png
          25 kB

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

              Created:
              Updated:
              Resolved: