Uploaded image for project: 'JBoss Transaction Manager'
  1. JBoss Transaction Manager
  2. JBTM-1124

jbosstm/jboss-as merge failed from the upstream

    Details

      Description

      the following error when doing 'git pull --rebase upstream master' on jbosstm/jboss-as(BRANCH_5).
      ...
      Auto-merging pom.xml
      Auto-merging jacorb/pom.xml
      CONFLICT (content): Merge conflict in jacorb/pom.xml
      Auto-merging build/pom.xml
      Auto-merging build/build.xml
      Failed to merge in the changes.
      Patch failed at 0001 5.0.0.M2-SNAPSHOT version of TS
      ...

      jacorb/pom.xm
      ...
      <dependency>
      <<<<<<< HEAD
      <groupId>org.jboss.as</groupId>
      <artifactId>jboss-as-network</artifactId>
      </dependency>

      <dependency>
      <groupId>org.jboss.jbossts</groupId>
      <artifactId>jbossjts</artifactId>
      =======
      <groupId>org.jboss.narayana.jts</groupId>
      <artifactId>narayana-jts</artifactId>
      >>>>>>> 5.0.0.M2-SNAPSHOT version of TS
      </dependency>

      see https://github.com/jbossas/jboss-as/commit/d3fb1ce3f1688a654e19c0e56b7f98e14fd7c137

        Gliffy Diagrams

          Attachments

            Activity

              People

              • Assignee:
                tomjenkinson Thomas Jenkinson
                Reporter:
                zhfeng Zheng Feng
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: