Details

    • Type: Task Task
    • Status: Closed Closed
    • Priority: Blocker Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 2.1.0-m2, 2.1
    • Component/s: Source Control
    • Security Level: Public (Public: Anyone can view)
    • Labels:
      None
    • Similar issues:
      KULRICE-6828Merge 2.1 branch changes into trunk
      KULRICE-7620Merge 2.1 branch changes into trunk (7/6)
      KULRICE-7559Merge 2.2 changes into trunk (6/27)
      KULRICE-7329Merge 2.0.2 changes into trunk (5/18)
      KULRICE-7387Merge 2.0.2 changes into trunk (5/25)
      KULRICE-7120Merge 2.0.2 changes into trunk
      KULRICE-12432Merge KULRICE-12021 changes from rice-2.3 branch to trunk
      KULRICE-7165Merge 2.0.2 changes into trunk (4/20)
      KULRICE-7206Merge 2.0.2 changes into trunk (4/27)
      KULRICE-7248Merge 2.0.2 changes into trunk (5/4)
    • KAI Review Status:
      Not Required
    • KTI Review Status:
      Not Required

      Description

      We need to get the 2.0.1 changes in to trunk for the 2.1 release.

      SVN Merge!

        Activity

        Hide
        Peter Giles (Inactive) added a comment -

        Merge output:

        gilesp@monolith:~/workspaces/rice-ws/merge/trunk$ svn merge -r31104:31482 https://svn.kuali.org/repos/rice/branches/rice-2.0Conflict discovered in 'development-tools/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        --- Merging r31105 through r31482 into '.':
        C    development-tools/pom.xml
        U    sampleapp/src/main/webapp/WEB-INF/struts-config.xml
        Conflict discovered in 'sampleapp/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: s
        
          (e)  edit             - change merged file in an editor
          (df) diff-full        - show all changes made to merged file
          (r)  resolved         - accept merged version of file
        
          (dc) display-conflict - show all conflicts (ignoring merged version)
          (mc) mine-conflict    - accept my version for all conflicts (same)
          (tc) theirs-conflict  - accept their version for all conflicts (same)
        
          (mf) mine-full        - accept my version of entire file (even non-conflicts)
          (tf) theirs-full      - accept their version of entire file (same)
        
          (p)  postpone         - mark the conflict to be resolved later
          (l)  launch           - launch external tool to resolve conflict
          (s)  show all         - show this list
        
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    sampleapp/pom.xml
        Conflict discovered in 'db/sql/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/sql/pom.xml
        Conflict discovered in 'db/impex/server/demo/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/server/demo/pom.xml
        Conflict discovered in 'db/impex/server/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/server/pom.xml
        Conflict discovered in 'db/impex/server/bootstrap/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/server/bootstrap/pom.xml
        Conflict discovered in 'db/impex/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/pom.xml
        Conflict discovered in 'db/impex/master/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/master/pom.xml
        Conflict discovered in 'db/impex/client/demo/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/client/demo/pom.xml
        Conflict discovered in 'db/impex/client/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/client/pom.xml
        Conflict discovered in 'db/impex/client/bootstrap/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/impex/client/bootstrap/pom.xml
        Conflict discovered in 'db/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    db/pom.xml
        A    core-service/impl/src/main/java/org/kuali/rice/coreservice/impl/service
        A    core-service/impl/src/main/java/org/kuali/rice/coreservice/impl/service/CoreServiceRemoteModuleService.java
        U    core-service/impl/src/main/resources/org/kuali/rice/coreservice/config/CoreServiceLocalSpringBeans.xml
        U    core-service/impl/src/main/resources/org/kuali/rice/coreservice/config/CoreServiceRemoteSpringBeans.xml
        Conflict discovered in 'core-service/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core-service/impl/pom.xml
        Conflict discovered in 'core-service/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core-service/api/pom.xml
        Conflict discovered in 'core-service/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core-service/pom.xml
        A    core-service/framework/src/main/java/org/kuali/rice/coreservice/framework/service
        Conflict discovered in 'core-service/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core-service/framework/pom.xml
        U    core-service/web/src/main/java/org/kuali/rice/coreservice/web/component/ComponentLookupableHelperServiceImpl.java
        U    core-service/web/src/main/java/org/kuali/rice/coreservice/web/namespace/NamespaceValuesFinder.java
        U    core-service/web/src/main/resources/org/kuali/rice/coreservice/web/parameter/Parameter.xml
        Conflict discovered in 'core-service/web/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core-service/web/pom.xml
        U    scripts/upgrades/1.0.3 to 2.0.0/db-updates/2012-02-14.sql
        U    scripts/upgrades/1.0.3 to 2.0.0/db-updates/mysql-2012-02-14.sql
        U    scripts/upgrades/1.0.3 to 2.0.0/final/update_final_mysql.sql
        U    scripts/upgrades/1.0.3 to 2.0.0/final/update_final_oracle.sql
        U    scripts/createproject.groovy
        U    src/site/docbook/images/KRMS_conceptual_hierarchy.png
        U    src/site/docbook/TRG/TRG_KRMS.xml
        U    src/site/docbook/books/release-notes.xml
        Conflict discovered in 'core/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core/impl/pom.xml
        U    core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableRadioButtonGroup.java
        U    core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableSelect.java
        U    core/api/src/main/java/org/kuali/rice/core/api/uif/DataType.java
        U    core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableCheckboxGroup.java
        U    core/api/src/main/java/org/kuali/rice/core/api/criteria/PredicateUtils.java
        U    core/api/src/main/java/org/kuali/rice/core/web/format/CurrencyFormatter.java
        Conflict discovered in 'core/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core/api/pom.xml
        Conflict discovered in 'core/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core/pom.xml
        Conflict discovered in 'core/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core/framework/pom.xml
        Conflict discovered in 'core/web/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    core/web/pom.xml
        Conflict discovered in 'pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    pom.xml
        A    kns/src/test/java/org/kuali/rice/kns/web/struts
        A    kns/src/test/java/org/kuali/rice/kns/web/struts/form
        A    kns/src/test/java/org/kuali/rice/kns/web/struts/form/pojo
        A    kns/src/test/java/org/kuali/rice/kns/web/struts/form/pojo/PojoPluginTest.java
        U    kns/src/test/groovy/org/kuali/rice/kns/util/FieldUtilsTest.groovy
        U    kns/src/main/java/org/kuali/rice/kns/kim/type/DataDictionaryTypeServiceHelper.java
        U    kns/src/main/java/org/kuali/rice/kns/kim/type/DataDictionaryTypeServiceBase.java
        U    kns/src/main/java/org/kuali/rice/kns/maintenance/KualiMaintainableImpl.java
        U    kns/src/main/java/org/kuali/rice/kns/maintenance/KualiGlobalMaintainableImpl.java
        U    kns/src/main/java/org/kuali/rice/kns/datadictionary/BusinessObjectEntry.java
        U    kns/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java
        U    kns/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableHelperServiceImpl.java
        U    kns/src/main/java/org/kuali/rice/kns/util/FieldUtils.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/form/pojo/PojoPropertyUtilsBean.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/form/pojo/PojoFormBase.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/form/KualiMaintenanceForm.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiAction.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiMaintenanceDocumentAction.java
        U    kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java
        U    kns/src/main/java/org/kuali/rice/kns/web/ui/SectionBridge.java
        U    kns/src/main/java/org/kuali/rice/kns/document/MaintenanceDocumentBase.java
        Conflict discovered in 'kns/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kns/pom.xml
        Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/KimModuleService.java'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    impl/src/main/java/org/kuali/rice/kim/service/impl/KimModuleService.java
        U    impl/src/main/java/org/kuali/rice/kim/lookup/GroupLookupableHelperServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/kim/document/GenericPermissionMaintainable.java
        Conflict discovered in 'impl/src/main/java/org/kuali/rice/krad/service/impl/ModuleServiceBase.java'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    impl/src/main/java/org/kuali/rice/krad/service/impl/ModuleServiceBase.java
        U    impl/src/main/java/org/kuali/rice/krad/service/impl/DataDictionaryRemoteFieldServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/krad/service/impl/SerializerServiceBase.java
        p
        U    impl/src/main/java/org/kuali/rice/krad/service/impl/XmlObjectSerializerServiceImpl.java
        D    impl/src/main/java/org/kuali/rice/krad/service/BusinessObjectNotLookupableException.java
        p
        p
        p
        U    impl/src/main/java/org/kuali/rice/krad/dao/impl/BusinessObjectDaoOjb.java
        p
        U    impl/src/main/java/org/kuali/rice/krad/dao/impl/LookupDaoOjb.java
        p
        p
        p
        U    impl/src/main/java/org/kuali/rice/krad/workflow/attribute/DataDictionarySearchableAttribute.java
        U    impl/src/main/java/org/kuali/rice/kew/export/KewExportDataSet.java
        A    impl/src/main/java/org/kuali/rice/kew/impl/service
        A    impl/src/main/java/org/kuali/rice/kew/impl/service/KewRemoteModuleService.java
        U    impl/src/main/java/org/kuali/rice/kew/impl/doctype/DocumentTypeServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchCriteriaTranslatorImpl.java
        U    impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchCriteriaBoLookupableHelperService.java
        U    impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchGeneratorImpl.java
        U    impl/src/main/java/org/kuali/rice/kew/impl/document/WorkflowDocumentImpl.java
        U    impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeAttributeBo.java
        U    impl/src/main/java/org/kuali/rice/kew/document/RoutingRuleDelegationMaintainable.java
        U    impl/src/main/java/org/kuali/rice/kew/document/RoutingRuleMaintainable.java
        U    impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessorKEWAdapter.java
        U    impl/src/main/java/org/kuali/rice/kew/service/impl/KEWModuleService.java
        U    impl/src/main/java/org/kuali/rice/kew/routemodule/RouteModule.java
        U    impl/src/main/java/org/kuali/rice/kew/rule/bo/RuleTemplateAttributeBo.java
        U    impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java
        U    impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java
        U    impl/src/main/java/org/kuali/rice/location/service/impl/LocationModuleService.java
        A    impl/src/main/java/org/kuali/rice/coreservice
        A    impl/src/main/java/org/kuali/rice/coreservice/service
        A    impl/src/main/java/org/kuali/rice/coreservice/service/impl
        A    impl/src/main/java/org/kuali/rice/coreservice/service/impl/CoreServiceModuleService.java
        U    impl/src/main/java/org/kuali/rice/kns/datadictionary/exporter/AttributesMapBuilder.java
        U    impl/src/main/java/org/kuali/rice/kns/service/impl/BusinessObjectAuthorizationServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/bo/NotificationMessageDelivery.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationContentTypeBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientListBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationResponseBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationSenderBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelReviewerBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationPriorityBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientBo.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/NotificationProducerBo.java
        U    impl/src/main/java/org/kuali/rice/ken/bo/Lockable.java
        A    impl/src/main/java/org/kuali/rice/ken/bo/UserChannelSubscriptionBo.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationSender.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelReviewer.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationPriority.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipient.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationProducer.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/UserChannelSubscription.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannel.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationContentType.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientList.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/NotificationResponse.java
        D    impl/src/main/java/org/kuali/rice/ken/bo/Notification.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationChannelService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationMessageDeliveryService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/UserPreferenceServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryAutoRemovalServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationChannelServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryResolverServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationContentTypeServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageContentServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/KENAPIServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/impl/SendNotificationServiceKewXmlImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationContentTypeService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationMessageContentService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/NotificationAuthorizationService.java
        U    impl/src/main/java/org/kuali/rice/ken/service/ws/impl/NotificationWebServiceImpl.java
        U    impl/src/main/java/org/kuali/rice/ken/service/UserPreferenceService.java
        U    impl/src/main/java/org/kuali/rice/ken/impl/config/KENConfigurer.java
        U    impl/src/main/java/org/kuali/rice/ken/dao/impl/NotificationDaoJpa.java
        U    impl/src/main/java/org/kuali/rice/ken/dao/impl/NotificationDaoOjb.java
        U    impl/src/main/java/org/kuali/rice/ken/dao/NotificationDao.java
        U    impl/src/main/java/org/kuali/rice/ken/postprocessor/kew/NotificationSenderFormPostProcessor.java
        U    impl/src/main/java/org/kuali/rice/ken/util/ContentTypeLSResourceResolver.java
        U    impl/src/main/java/org/kuali/rice/ken/util/ContentTypeResourceResolver.java
        U    impl/src/main/java/org/kuali/rice/ken/util/Util.java
        U    impl/src/main/java/org/kuali/rice/ken/util/NotificationConstants.java
        U    impl/src/main/java/org/kuali/rice/ken/util/ContentTypeEntityResolver.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/ContentTypeController.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/AdministerNotificationRequestController.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/UserPreferencesController.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/SendNotificationMessageController.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/NotificationController.java
        U    impl/src/main/java/org/kuali/rice/ken/web/spring/SendEventNotificationMessageController.java
        U    impl/src/main/resources/org/kuali/rice/kew/config/_KewCommonSpringBeans.xml
        U    impl/src/main/resources/org/kuali/rice/kew/config/KewEmbeddedSpringBeans.xml
        U    impl/src/main/resources/org/kuali/rice/kew/config/KewRemoteSpringBeans.xml
        U    impl/src/main/resources/org/kuali/rice/ken/config/OJB-repository-ken.xml
        Conflict discovered in 'impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    impl/pom.xml
        Conflict discovered in 'dist/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    dist/pom.xml
        A    location/impl/src/main/java/org/kuali/rice/location/impl/service/LocationRemoteModuleService.java
        U    location/impl/src/main/java/org/kuali/rice/location/impl/state/StateServiceImpl.java
        U    location/impl/src/main/java/org/kuali/rice/location/impl/county/CountyServiceImpl.java
        U    location/impl/src/main/java/org/kuali/rice/location/impl/country/CountryServiceImpl.java
        U    location/impl/src/main/java/org/kuali/rice/location/impl/campus/CampusServiceImpl.java
        U    location/impl/src/main/java/org/kuali/rice/location/impl/postalcode/PostalCodeServiceImpl.java
        U    location/impl/src/main/resources/org/kuali/rice/location/config/LocationRemoteSpringBeans.xml
        U    location/impl/src/main/resources/org/kuali/rice/location/config/_LocationCommonSpringBeans.xml
        U    location/impl/src/main/resources/org/kuali/rice/location/config/LocationLocalSpringBeans.xml
        Conflict discovered in 'location/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    location/impl/pom.xml
        U    location/api/src/main/java/org/kuali/rice/location/api/state/StateService.java
        A    location/api/src/main/java/org/kuali/rice/location/api/state/StateQueryResults.java
        U    location/api/src/main/java/org/kuali/rice/location/api/county/CountyService.java
        A    location/api/src/main/java/org/kuali/rice/location/api/county/CountyQueryResults.java
        U    location/api/src/main/java/org/kuali/rice/location/api/country/CountryService.java
        A    location/api/src/main/java/org/kuali/rice/location/api/country/CountryQueryResults.java
        A    location/api/src/main/java/org/kuali/rice/location/api/campus/CampusQueryResults.java
        A    location/api/src/main/java/org/kuali/rice/location/api/campus/CampusTypeQueryResults.java
        U    location/api/src/main/java/org/kuali/rice/location/api/campus/CampusService.java
        A    location/api/src/main/java/org/kuali/rice/location/api/postalcode/PostalCodeQueryResults.java
        U    location/api/src/main/java/org/kuali/rice/location/api/postalcode/PostalCodeService.java
        Conflict discovered in 'location/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    location/api/pom.xml
        Conflict discovered in 'location/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    location/pom.xml
        U    location/framework/src/main/java/org/kuali/rice/location/framework/state/StateValuesFinder.java
        Conflict discovered in 'location/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    location/framework/pom.xml
        Conflict discovered in 'location/web/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    location/web/pom.xml
        U    ken/api/src/main/java/org/kuali/rice/ken/api/service/SendNotificationService.java
        U    ken/api/src/main/java/org/kuali/rice/ken/api/KenApiConstants.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationResponseContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationResponse.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/UserChannelSubscriptionContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/UserChannelSubscription.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannel.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContentTypeContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContentType.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationListRecipientContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationSenderContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationListRecipient.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/Notification.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelReviewerContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationPriorityContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationRecipientContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationSender.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationProducerContract.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationPriority.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelReviewer.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationRecipient.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationProducer.java
        A    ken/api/src/main/java/org/kuali/rice/ken/api/common
        A    ken/api/src/main/java/org/kuali/rice/ken/api/common/KenIdentifiable.java
        Conflict discovered in 'ken/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: C    ken/api/pom.xml
        Conflict discovered in 'ken/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ken/pom.xml
        U    web/src/main/webapp/ksb/WEB-INF/struts-config.xml
        U    web/src/main/webapp/kim/WEB-INF/struts-config.xml
        U    web/src/main/webapp/kew/WEB-INF/struts-config.xml
        U    web/src/main/webapp/kew/WEB-INF/jsp/ActionList/ActionList.jsp
        U    web/src/main/webapp/WEB-INF/struts-config.xml
        U    web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag
        U    web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag
        U    web/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag
        U    web/src/main/webapp/core/WEB-INF/struts-config.xml
        U    web/src/main/webapp/kr/scripts/dhtml.js
        A    web/src/main/webapp/kr/static/images/tinybutton-replace.gif
        Conflict discovered in 'web/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    web/pom.xml
        Conflict discovered in 'ksb/server-impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ksb/server-impl/pom.xml
        Conflict discovered in 'ksb/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ksb/api/pom.xml
        Conflict discovered in 'ksb/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ksb/pom.xml
        Conflict discovered in 'ksb/client-impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ksb/client-impl/pom.xml
        Conflict discovered in 'ksb/web/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    ksb/web/pom.xml
        U    kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/role/RoleResponsibilityActionBoTest.groovy
        U    kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/role/RoleResponsibilityBoTest.groovy
        A    kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common
        A    kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common/delegate
        A    kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateTypeBoTest.groovy
        U    kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/role/RoleDaoOjb.java
        A    kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/services/KimRemoteModuleService.java
        U    kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/identity/IdentityCurrentAndArchivedServiceImpl.java
        U    kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/identity/IdentityServiceImpl.java
        U    kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/responsibility/ReviewResponsibilityBo.groovy
        U    kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateTypeBo.groovy
        U    kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateMemberBo.groovy
        U    kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/_KimCommonSpringBeans.xml
        U    kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/KimEmbeddedSpringBeans.xml
        U    kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/KimRemoteSpringBeans.xml
        Conflict discovered in 'kim/kim-impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kim/kim-impl/pom.xml
        U    kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/role/RoleResponsibilityActionTest.groovy
        U    kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/role/RoleResponsibilityTest.groovy
        U    kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/type/KimTypeAttributeTest.groovy
        U    kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/common/attribute/KimAttributeTest.groovy
        U    kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/common/template/TemplateTest.groovy
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RoleResponsibilityAction.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RoleResponsibility.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RolePermission.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/type/KimTypeAttribute.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/attribute/KimAttribute.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/attribute/KimAttributeData.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/delegate/DelegateMember.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/template/Template.java
        U    kim/kim-api/src/main/java/org/kuali/rice/kim/api/identity/IdentityService.java
        Conflict discovered in 'kim/kim-api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kim/kim-api/pom.xml
        Conflict discovered in 'kim/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kim/pom.xml
        U    kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/external/EntityExternalIdentifierTypeEbo.groovy
        U    kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/employment/EntityEmploymentTypeEbo.groovy
        U    kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/employment/EntityEmploymentStatusEbo.groovy
        Conflict discovered in 'kim/kim-framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kim/kim-framework/pom.xml
        Conflict discovered in 'kim/kim-ldap/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kim/kim-ldap/pom.xml
        A    krad/krad-web-framework/src/test/groovy/org/kuali/rice/krad/util/KRADUtilsTest.groovy
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/datadictionary/validation/constraint/resolver/CaseConstraintResolver.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/datadictionary/validation/result/DictionaryValidationResult.java
        A    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/service/BusinessObjectNotLookupableException.java
        A    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/service/impl/RemoteModuleServiceBase.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintainableImpl.java
        Conflict discovered in 'krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintenanceDocumentBase.java'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintenanceDocumentBase.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/rules/MaintenanceDocumentRuleBase.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/util/KRADUtils.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/util/ObjectUtils.java
        U    krad/krad-web-framework/src/main/java/org/kuali/rice/krad/document/DocumentBase.java
        Conflict discovered in 'krad/krad-web-framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krad/krad-web-framework/pom.xml
        U    krad/krad-app-framework/src/main/java/org/kuali/rice/krad/bo/Note.java
        U    krad/krad-app-framework/src/main/java/org/kuali/rice/krad/bo/PersistableBusinessObjectBase.java
        U    krad/krad-app-framework/src/main/java/org/kuali/rice/krad/UserSession.java
        U    krad/krad-app-framework/src/main/java/org/kuali/rice/krad/util/ExternalizableBusinessObjectUtils.java
        Conflict discovered in 'krad/krad-app-framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krad/krad-app-framework/pom.xml
        Conflict discovered in 'krad/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krad/pom.xml
        Conflict discovered in 'kew/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kew/impl/pom.xml
        U    kew/api/src/main/java/org/kuali/rice/kew/api/WorkflowDocument.java
        U    kew/api/src/main/java/org/kuali/rice/kew/api/doctype/DocumentTypeService.java
        Conflict discovered in 'kew/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kew/api/pom.xml
        Conflict discovered in 'kew/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kew/pom.xml
        Conflict discovered in 'kew/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    kew/framework/pom.xml
        Conflict discovered in 'standalone/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    standalone/pom.xml
        Conflict discovered in 'edl/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    edl/impl/pom.xml
        Conflict discovered in 'edl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    edl/pom.xml
        Conflict discovered in 'edl/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    edl/framework/pom.xml
        Conflict discovered in 'config/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    config/pom.xml
        Conflict discovered in 'config/deploy/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    config/deploy/pom.xml
        Conflict discovered in 'config/checkstyle/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    config/checkstyle/pom.xml
        U    config/templates/createproject.SampleAppBeans.template.xml
        U    config/templates/createproject.SpringBeans.template.xml
        U    config/templates/createproject.pom.template.xml
        U    krms/impl/src/main/java/org/kuali/rice/krms/impl/repository/RuleRepositoryServiceImpl.java
        U    krms/impl/src/main/java/org/kuali/rice/krms/impl/type/AgendaTypeServiceBase.java
        Conflict discovered in 'krms/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krms/impl/pom.xml
        U    krms/api/src/main/java/org/kuali/rice/krms/api/engine/EngineResults.java
        Conflict discovered in 'krms/api/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krms/api/pom.xml
        Conflict discovered in 'krms/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krms/pom.xml
        U    krms/framework/src/main/java/org/kuali/rice/krms/framework/engine/EngineResultsImpl.java
        U    krms/framework/src/main/java/org/kuali/rice/krms/framework/engine/CompoundProposition.java
        Conflict discovered in 'krms/framework/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    krms/framework/pom.xml
        Conflict discovered in 'client-contrib/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    client-contrib/pom.xml
        Conflict discovered in 'it/kcb/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/kcb/pom.xml
        U    it/ksb/src/test/java/org/kuali/rice/ksb/messaging/ExceptionRetryCountTest.java
        Conflict discovered in 'it/ksb/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/ksb/pom.xml
        Conflict discovered in 'it/kim/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/kim/pom.xml
        Conflict discovered in 'it/impl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/impl/pom.xml
        U    it/krad/src/test/java/org/kuali/rice/krad/service/BusinessObjectServiceTest.java
        U    it/krad/src/test/java/org/kuali/rice/krad/impls/MockWorkflowDocument.java
        U    it/krad/src/test/java/org/kuali/rice/krad/workflow/DataDictionarySearchableAttributeTest.java
        Conflict discovered in 'it/krad/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/krad/pom.xml
        Conflict discovered in 'it/edl/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/edl/pom.xml
        U    it/kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java
        U    it/kew/src/test/java/org/kuali/rice/kew/clientapp/WorkflowDocumentTest.java
        U    it/kew/src/test/java/org/kuali/rice/kew/docsearch/SearchableAttributeTest.java
        U    it/kew/src/test/java/org/kuali/rice/kew/actions/ReturnToPreviousNodeActionTest.java
        U    it/kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java
        Conflict discovered in 'it/kew/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/kew/pom.xml
        Conflict discovered in 'it/core/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/core/pom.xml
        Conflict discovered in 'it/location/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/location/pom.xml
        Conflict discovered in 'it/internal-tools/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/internal-tools/pom.xml
        Conflict discovered in 'it/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/pom.xml
        U    it/remote/src/test/groovy/org/kuali/rice/ken/service/SendNotificationServiceRemoteTest.groovy
        Conflict discovered in 'it/remote/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/remote/pom.xml
        Conflict discovered in 'it/krms/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/krms/pom.xml
        U    it/ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java
        U    it/ken/src/test/java/org/kuali/rice/ken/test/util/MockObjectsUtil.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/UserChannelSubscriptionDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationChannelDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/BusinessObjectDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationContentTypeDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationRecipientListDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationChannelReviewerDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationPriorityDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationProducerDaoTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/UserPreferenceServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageDeliveryServiceImplTest.java
        A    it/ken/src/test/java/org/kuali/rice/ken/services/impl/SendNotificationServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageDeliveryResolverServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationContentTypeServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageContentServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationAuthorizationServiceImplTest.java
        U    it/ken/src/test/java/org/kuali/rice/ken/core/TestOJBTest.java
        Conflict discovered in 'it/ken/pom.xml'.
        Select: (p) postpone, (df) diff-full, (e) edit,
                (mc) mine-conflict, (tc) theirs-conflict,
                (s) show all options: p
        C    it/ken/pom.xml
        Summary of conflicts:
          Text conflicts: 80
        gilesp@monolith:~/workspaces/rice-ws/merge/trunk$ 
        
        Show
        Peter Giles (Inactive) added a comment - Merge output: gilesp@monolith:~/workspaces/rice-ws/merge/trunk$ svn merge -r31104:31482 https: //svn.kuali.org/repos/rice/branches/rice-2.0Conflict discovered in 'development-tools/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r31105 through r31482 into '.': C development-tools/pom.xml U sampleapp/src/main/webapp/WEB-INF/struts-config.xml Conflict discovered in 'sampleapp/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: s (e) edit - change merged file in an editor (df) diff-full - show all changes made to merged file (r) resolved - accept merged version of file (dc) display-conflict - show all conflicts (ignoring merged version) (mc) mine-conflict - accept my version for all conflicts (same) (tc) theirs-conflict - accept their version for all conflicts (same) (mf) mine-full - accept my version of entire file (even non-conflicts) (tf) theirs-full - accept their version of entire file (same) (p) postpone - mark the conflict to be resolved later (l) launch - launch external tool to resolve conflict (s) show all - show this list Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C sampleapp/pom.xml Conflict discovered in 'db/sql/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/sql/pom.xml Conflict discovered in 'db/impex/server/demo/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/server/demo/pom.xml Conflict discovered in 'db/impex/server/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/server/pom.xml Conflict discovered in 'db/impex/server/bootstrap/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/server/bootstrap/pom.xml Conflict discovered in 'db/impex/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/pom.xml Conflict discovered in 'db/impex/master/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/master/pom.xml Conflict discovered in 'db/impex/client/demo/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/client/demo/pom.xml Conflict discovered in 'db/impex/client/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/client/pom.xml Conflict discovered in 'db/impex/client/bootstrap/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/impex/client/bootstrap/pom.xml Conflict discovered in 'db/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C db/pom.xml A core-service/impl/src/main/java/org/kuali/rice/coreservice/impl/service A core-service/impl/src/main/java/org/kuali/rice/coreservice/impl/service/CoreServiceRemoteModuleService.java U core-service/impl/src/main/resources/org/kuali/rice/coreservice/config/CoreServiceLocalSpringBeans.xml U core-service/impl/src/main/resources/org/kuali/rice/coreservice/config/CoreServiceRemoteSpringBeans.xml Conflict discovered in 'core-service/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core-service/impl/pom.xml Conflict discovered in 'core-service/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core-service/api/pom.xml Conflict discovered in 'core-service/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core-service/pom.xml A core-service/framework/src/main/java/org/kuali/rice/coreservice/framework/service Conflict discovered in 'core-service/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core-service/framework/pom.xml U core-service/web/src/main/java/org/kuali/rice/coreservice/web/component/ComponentLookupableHelperServiceImpl.java U core-service/web/src/main/java/org/kuali/rice/coreservice/web/namespace/NamespaceValuesFinder.java U core-service/web/src/main/resources/org/kuali/rice/coreservice/web/parameter/Parameter.xml Conflict discovered in 'core-service/web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core-service/web/pom.xml U scripts/upgrades/1.0.3 to 2.0.0/db-updates/2012-02-14.sql U scripts/upgrades/1.0.3 to 2.0.0/db-updates/mysql-2012-02-14.sql U scripts/upgrades/1.0.3 to 2.0.0/ final /update_final_mysql.sql U scripts/upgrades/1.0.3 to 2.0.0/ final /update_final_oracle.sql U scripts/createproject.groovy U src/site/docbook/images/KRMS_conceptual_hierarchy.png U src/site/docbook/TRG/TRG_KRMS.xml U src/site/docbook/books/release-notes.xml Conflict discovered in 'core/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core/impl/pom.xml U core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableRadioButtonGroup.java U core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableSelect.java U core/api/src/main/java/org/kuali/rice/core/api/uif/DataType.java U core/api/src/main/java/org/kuali/rice/core/api/uif/RemotableCheckboxGroup.java U core/api/src/main/java/org/kuali/rice/core/api/criteria/PredicateUtils.java U core/api/src/main/java/org/kuali/rice/core/web/format/CurrencyFormatter.java Conflict discovered in 'core/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core/api/pom.xml Conflict discovered in 'core/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core/pom.xml Conflict discovered in 'core/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core/framework/pom.xml Conflict discovered in 'core/web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C core/web/pom.xml Conflict discovered in 'pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C pom.xml A kns/src/test/java/org/kuali/rice/kns/web/struts A kns/src/test/java/org/kuali/rice/kns/web/struts/form A kns/src/test/java/org/kuali/rice/kns/web/struts/form/pojo A kns/src/test/java/org/kuali/rice/kns/web/struts/form/pojo/PojoPluginTest.java U kns/src/test/groovy/org/kuali/rice/kns/util/FieldUtilsTest.groovy U kns/src/main/java/org/kuali/rice/kns/kim/type/DataDictionaryTypeServiceHelper.java U kns/src/main/java/org/kuali/rice/kns/kim/type/DataDictionaryTypeServiceBase.java U kns/src/main/java/org/kuali/rice/kns/maintenance/KualiMaintainableImpl.java U kns/src/main/java/org/kuali/rice/kns/maintenance/KualiGlobalMaintainableImpl.java U kns/src/main/java/org/kuali/rice/kns/datadictionary/BusinessObjectEntry.java U kns/src/main/java/org/kuali/rice/kns/lookup/AbstractLookupableHelperServiceImpl.java U kns/src/main/java/org/kuali/rice/kns/lookup/KualiLookupableHelperServiceImpl.java U kns/src/main/java/org/kuali/rice/kns/util/FieldUtils.java U kns/src/main/java/org/kuali/rice/kns/web/struts/form/pojo/PojoPropertyUtilsBean.java U kns/src/main/java/org/kuali/rice/kns/web/struts/form/pojo/PojoFormBase.java U kns/src/main/java/org/kuali/rice/kns/web/struts/form/KualiMaintenanceForm.java U kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiAction.java U kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiMaintenanceDocumentAction.java U kns/src/main/java/org/kuali/rice/kns/web/struts/action/KualiDocumentActionBase.java U kns/src/main/java/org/kuali/rice/kns/web/ui/SectionBridge.java U kns/src/main/java/org/kuali/rice/kns/document/MaintenanceDocumentBase.java Conflict discovered in 'kns/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kns/pom.xml Conflict discovered in 'impl/src/main/java/org/kuali/rice/kim/service/impl/KimModuleService.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl/src/main/java/org/kuali/rice/kim/service/impl/KimModuleService.java U impl/src/main/java/org/kuali/rice/kim/lookup/GroupLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/document/GenericPermissionMaintainable.java Conflict discovered in 'impl/src/main/java/org/kuali/rice/krad/service/impl/ModuleServiceBase.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C impl/src/main/java/org/kuali/rice/krad/service/impl/ModuleServiceBase.java U impl/src/main/java/org/kuali/rice/krad/service/impl/DataDictionaryRemoteFieldServiceImpl.java U impl/src/main/java/org/kuali/rice/krad/service/impl/SerializerServiceBase.java p U impl/src/main/java/org/kuali/rice/krad/service/impl/XmlObjectSerializerServiceImpl.java D impl/src/main/java/org/kuali/rice/krad/service/BusinessObjectNotLookupableException.java p p p U impl/src/main/java/org/kuali/rice/krad/dao/impl/BusinessObjectDaoOjb.java p U impl/src/main/java/org/kuali/rice/krad/dao/impl/LookupDaoOjb.java p p p U impl/src/main/java/org/kuali/rice/krad/workflow/attribute/DataDictionarySearchableAttribute.java U impl/src/main/java/org/kuali/rice/kew/export/KewExportDataSet.java A impl/src/main/java/org/kuali/rice/kew/impl/service A impl/src/main/java/org/kuali/rice/kew/impl/service/KewRemoteModuleService.java U impl/src/main/java/org/kuali/rice/kew/impl/doctype/DocumentTypeServiceImpl.java U impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchCriteriaTranslatorImpl.java U impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchCriteriaBoLookupableHelperService.java U impl/src/main/java/org/kuali/rice/kew/impl/document/search/DocumentSearchGeneratorImpl.java U impl/src/main/java/org/kuali/rice/kew/impl/document/WorkflowDocumentImpl.java U impl/src/main/java/org/kuali/rice/kew/doctype/DocumentTypeAttributeBo.java U impl/src/main/java/org/kuali/rice/kew/document/RoutingRuleDelegationMaintainable.java U impl/src/main/java/org/kuali/rice/kew/document/RoutingRuleMaintainable.java U impl/src/main/java/org/kuali/rice/kew/docsearch/DocumentSearchCriteriaProcessorKEWAdapter.java U impl/src/main/java/org/kuali/rice/kew/service/impl/KEWModuleService.java U impl/src/main/java/org/kuali/rice/kew/routemodule/RouteModule.java U impl/src/main/java/org/kuali/rice/kew/rule/bo/RuleTemplateAttributeBo.java U impl/src/main/java/org/kuali/rice/kew/rule/RuleRoutingAttribute.java U impl/src/main/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttribute.java U impl/src/main/java/org/kuali/rice/location/service/impl/LocationModuleService.java A impl/src/main/java/org/kuali/rice/coreservice A impl/src/main/java/org/kuali/rice/coreservice/service A impl/src/main/java/org/kuali/rice/coreservice/service/impl A impl/src/main/java/org/kuali/rice/coreservice/service/impl/CoreServiceModuleService.java U impl/src/main/java/org/kuali/rice/kns/datadictionary/exporter/AttributesMapBuilder.java U impl/src/main/java/org/kuali/rice/kns/service/impl/BusinessObjectAuthorizationServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/bo/NotificationMessageDelivery.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationContentTypeBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientListBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationResponseBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationSenderBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelReviewerBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationPriorityBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientBo.java A impl/src/main/java/org/kuali/rice/ken/bo/NotificationProducerBo.java U impl/src/main/java/org/kuali/rice/ken/bo/Lockable.java A impl/src/main/java/org/kuali/rice/ken/bo/UserChannelSubscriptionBo.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationSender.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannelReviewer.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationPriority.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipient.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationProducer.java D impl/src/main/java/org/kuali/rice/ken/bo/UserChannelSubscription.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationChannel.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationContentType.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationRecipientList.java D impl/src/main/java/org/kuali/rice/ken/bo/NotificationResponse.java D impl/src/main/java/org/kuali/rice/ken/bo/Notification.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationChannelService.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationMessageDeliveryService.java U impl/src/main/java/org/kuali/rice/ken/service/impl/UserPreferenceServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryAutoRemovalServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationChannelServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageDeliveryResolverServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationContentTypeServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationMessageContentServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/KENAPIServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/NotificationAuthorizationServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/impl/SendNotificationServiceKewXmlImpl.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationContentTypeService.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationMessageContentService.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationService.java U impl/src/main/java/org/kuali/rice/ken/service/NotificationAuthorizationService.java U impl/src/main/java/org/kuali/rice/ken/service/ws/impl/NotificationWebServiceImpl.java U impl/src/main/java/org/kuali/rice/ken/service/UserPreferenceService.java U impl/src/main/java/org/kuali/rice/ken/impl/config/KENConfigurer.java U impl/src/main/java/org/kuali/rice/ken/dao/impl/NotificationDaoJpa.java U impl/src/main/java/org/kuali/rice/ken/dao/impl/NotificationDaoOjb.java U impl/src/main/java/org/kuali/rice/ken/dao/NotificationDao.java U impl/src/main/java/org/kuali/rice/ken/postprocessor/kew/NotificationSenderFormPostProcessor.java U impl/src/main/java/org/kuali/rice/ken/util/ContentTypeLSResourceResolver.java U impl/src/main/java/org/kuali/rice/ken/util/ContentTypeResourceResolver.java U impl/src/main/java/org/kuali/rice/ken/util/Util.java U impl/src/main/java/org/kuali/rice/ken/util/NotificationConstants.java U impl/src/main/java/org/kuali/rice/ken/util/ContentTypeEntityResolver.java U impl/src/main/java/org/kuali/rice/ken/web/spring/ContentTypeController.java U impl/src/main/java/org/kuali/rice/ken/web/spring/AdministerNotificationRequestController.java U impl/src/main/java/org/kuali/rice/ken/web/spring/UserPreferencesController.java U impl/src/main/java/org/kuali/rice/ken/web/spring/SendNotificationMessageController.java U impl/src/main/java/org/kuali/rice/ken/web/spring/NotificationController.java U impl/src/main/java/org/kuali/rice/ken/web/spring/SendEventNotificationMessageController.java U impl/src/main/resources/org/kuali/rice/kew/config/_KewCommonSpringBeans.xml U impl/src/main/resources/org/kuali/rice/kew/config/KewEmbeddedSpringBeans.xml U impl/src/main/resources/org/kuali/rice/kew/config/KewRemoteSpringBeans.xml U impl/src/main/resources/org/kuali/rice/ken/config/OJB-repository-ken.xml Conflict discovered in 'impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C impl/pom.xml Conflict discovered in 'dist/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C dist/pom.xml A location/impl/src/main/java/org/kuali/rice/location/impl/service/LocationRemoteModuleService.java U location/impl/src/main/java/org/kuali/rice/location/impl/state/StateServiceImpl.java U location/impl/src/main/java/org/kuali/rice/location/impl/county/CountyServiceImpl.java U location/impl/src/main/java/org/kuali/rice/location/impl/country/CountryServiceImpl.java U location/impl/src/main/java/org/kuali/rice/location/impl/campus/CampusServiceImpl.java U location/impl/src/main/java/org/kuali/rice/location/impl/postalcode/PostalCodeServiceImpl.java U location/impl/src/main/resources/org/kuali/rice/location/config/LocationRemoteSpringBeans.xml U location/impl/src/main/resources/org/kuali/rice/location/config/_LocationCommonSpringBeans.xml U location/impl/src/main/resources/org/kuali/rice/location/config/LocationLocalSpringBeans.xml Conflict discovered in 'location/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C location/impl/pom.xml U location/api/src/main/java/org/kuali/rice/location/api/state/StateService.java A location/api/src/main/java/org/kuali/rice/location/api/state/StateQueryResults.java U location/api/src/main/java/org/kuali/rice/location/api/county/CountyService.java A location/api/src/main/java/org/kuali/rice/location/api/county/CountyQueryResults.java U location/api/src/main/java/org/kuali/rice/location/api/country/CountryService.java A location/api/src/main/java/org/kuali/rice/location/api/country/CountryQueryResults.java A location/api/src/main/java/org/kuali/rice/location/api/campus/CampusQueryResults.java A location/api/src/main/java/org/kuali/rice/location/api/campus/CampusTypeQueryResults.java U location/api/src/main/java/org/kuali/rice/location/api/campus/CampusService.java A location/api/src/main/java/org/kuali/rice/location/api/postalcode/PostalCodeQueryResults.java U location/api/src/main/java/org/kuali/rice/location/api/postalcode/PostalCodeService.java Conflict discovered in 'location/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C location/api/pom.xml Conflict discovered in 'location/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C location/pom.xml U location/framework/src/main/java/org/kuali/rice/location/framework/state/StateValuesFinder.java Conflict discovered in 'location/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C location/framework/pom.xml Conflict discovered in 'location/web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C location/web/pom.xml U ken/api/src/main/java/org/kuali/rice/ken/api/service/SendNotificationService.java U ken/api/src/main/java/org/kuali/rice/ken/api/KenApiConstants.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationResponseContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationResponse.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/UserChannelSubscriptionContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/UserChannelSubscription.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannel.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContentTypeContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContentType.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationListRecipientContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationSenderContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationListRecipient.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/Notification.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelReviewerContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationPriorityContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationRecipientContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationSender.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationProducerContract.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationPriority.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationChannelReviewer.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationRecipient.java A ken/api/src/main/java/org/kuali/rice/ken/api/notification/NotificationProducer.java A ken/api/src/main/java/org/kuali/rice/ken/api/common A ken/api/src/main/java/org/kuali/rice/ken/api/common/KenIdentifiable.java Conflict discovered in 'ken/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: C ken/api/pom.xml Conflict discovered in 'ken/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ken/pom.xml U web/src/main/webapp/ksb/WEB-INF/struts-config.xml U web/src/main/webapp/kim/WEB-INF/struts-config.xml U web/src/main/webapp/kew/WEB-INF/struts-config.xml U web/src/main/webapp/kew/WEB-INF/jsp/ActionList/ActionList.jsp U web/src/main/webapp/WEB-INF/struts-config.xml U web/src/main/webapp/WEB-INF/tags/kim/groupAssignees.tag U web/src/main/webapp/WEB-INF/tags/kim/roleAssignees.tag U web/src/main/webapp/WEB-INF/tags/kr/rowDisplay.tag U web/src/main/webapp/core/WEB-INF/struts-config.xml U web/src/main/webapp/kr/scripts/dhtml.js A web/src/main/webapp/kr/ static /images/tinybutton-replace.gif Conflict discovered in 'web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C web/pom.xml Conflict discovered in 'ksb/server-impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb/server-impl/pom.xml Conflict discovered in 'ksb/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb/api/pom.xml Conflict discovered in 'ksb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb/pom.xml Conflict discovered in 'ksb/client-impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb/client-impl/pom.xml Conflict discovered in 'ksb/web/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C ksb/web/pom.xml U kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/role/RoleResponsibilityActionBoTest.groovy U kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/role/RoleResponsibilityBoTest.groovy A kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common A kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common/delegate A kim/kim-impl/src/test/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateTypeBoTest.groovy U kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/role/RoleDaoOjb.java A kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/services/KimRemoteModuleService.java U kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/identity/IdentityCurrentAndArchivedServiceImpl.java U kim/kim-impl/src/main/java/org/kuali/rice/kim/impl/identity/IdentityServiceImpl.java U kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/responsibility/ReviewResponsibilityBo.groovy U kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateTypeBo.groovy U kim/kim-impl/src/main/groovy/org/kuali/rice/kim/impl/common/delegate/DelegateMemberBo.groovy U kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/_KimCommonSpringBeans.xml U kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/KimEmbeddedSpringBeans.xml U kim/kim-impl/src/main/resources/org/kuali/rice/kim/impl/config/KimRemoteSpringBeans.xml Conflict discovered in 'kim/kim-impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim/kim-impl/pom.xml U kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/role/RoleResponsibilityActionTest.groovy U kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/role/RoleResponsibilityTest.groovy U kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/type/KimTypeAttributeTest.groovy U kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/common/attribute/KimAttributeTest.groovy U kim/kim-api/src/test/groovy/org/kuali/rice/kim/api/common/template/TemplateTest.groovy U kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RoleResponsibilityAction.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RoleResponsibility.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/role/RolePermission.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/type/KimTypeAttribute.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/attribute/KimAttribute.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/attribute/KimAttributeData.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/delegate/DelegateMember.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/common/template/Template.java U kim/kim-api/src/main/java/org/kuali/rice/kim/api/identity/IdentityService.java Conflict discovered in 'kim/kim-api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim/kim-api/pom.xml Conflict discovered in 'kim/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim/pom.xml U kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/external/EntityExternalIdentifierTypeEbo.groovy U kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/employment/EntityEmploymentTypeEbo.groovy U kim/kim-framework/src/main/groovy/org/kuali/rice/kim/framework/identity/employment/EntityEmploymentStatusEbo.groovy Conflict discovered in 'kim/kim-framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim/kim-framework/pom.xml Conflict discovered in 'kim/kim-ldap/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kim/kim-ldap/pom.xml A krad/krad-web-framework/src/test/groovy/org/kuali/rice/krad/util/KRADUtilsTest.groovy U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/datadictionary/validation/constraint/resolver/CaseConstraintResolver.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/datadictionary/validation/result/DictionaryValidationResult.java A krad/krad-web-framework/src/main/java/org/kuali/rice/krad/service/BusinessObjectNotLookupableException.java A krad/krad-web-framework/src/main/java/org/kuali/rice/krad/service/impl/RemoteModuleServiceBase.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintainableImpl.java Conflict discovered in 'krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintenanceDocumentBase.java'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krad/krad-web-framework/src/main/java/org/kuali/rice/krad/maintenance/MaintenanceDocumentBase.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/rules/MaintenanceDocumentRuleBase.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/util/KRADUtils.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/util/ObjectUtils.java U krad/krad-web-framework/src/main/java/org/kuali/rice/krad/document/DocumentBase.java Conflict discovered in 'krad/krad-web-framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krad/krad-web-framework/pom.xml U krad/krad-app-framework/src/main/java/org/kuali/rice/krad/bo/Note.java U krad/krad-app-framework/src/main/java/org/kuali/rice/krad/bo/PersistableBusinessObjectBase.java U krad/krad-app-framework/src/main/java/org/kuali/rice/krad/UserSession.java U krad/krad-app-framework/src/main/java/org/kuali/rice/krad/util/ExternalizableBusinessObjectUtils.java Conflict discovered in 'krad/krad-app-framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krad/krad-app-framework/pom.xml Conflict discovered in 'krad/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krad/pom.xml Conflict discovered in 'kew/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew/impl/pom.xml U kew/api/src/main/java/org/kuali/rice/kew/api/WorkflowDocument.java U kew/api/src/main/java/org/kuali/rice/kew/api/doctype/DocumentTypeService.java Conflict discovered in 'kew/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew/api/pom.xml Conflict discovered in 'kew/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew/pom.xml Conflict discovered in 'kew/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C kew/framework/pom.xml Conflict discovered in 'standalone/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C standalone/pom.xml Conflict discovered in 'edl/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C edl/impl/pom.xml Conflict discovered in 'edl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C edl/pom.xml Conflict discovered in 'edl/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C edl/framework/pom.xml Conflict discovered in 'config/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C config/pom.xml Conflict discovered in 'config/deploy/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C config/deploy/pom.xml Conflict discovered in 'config/checkstyle/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C config/checkstyle/pom.xml U config/templates/createproject.SampleAppBeans.template.xml U config/templates/createproject.SpringBeans.template.xml U config/templates/createproject.pom.template.xml U krms/impl/src/main/java/org/kuali/rice/krms/impl/repository/RuleRepositoryServiceImpl.java U krms/impl/src/main/java/org/kuali/rice/krms/impl/type/AgendaTypeServiceBase.java Conflict discovered in 'krms/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krms/impl/pom.xml U krms/api/src/main/java/org/kuali/rice/krms/api/engine/EngineResults.java Conflict discovered in 'krms/api/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krms/api/pom.xml Conflict discovered in 'krms/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krms/pom.xml U krms/framework/src/main/java/org/kuali/rice/krms/framework/engine/EngineResultsImpl.java U krms/framework/src/main/java/org/kuali/rice/krms/framework/engine/CompoundProposition.java Conflict discovered in 'krms/framework/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C krms/framework/pom.xml Conflict discovered in 'client-contrib/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C client-contrib/pom.xml Conflict discovered in 'it/kcb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/kcb/pom.xml U it/ksb/src/test/java/org/kuali/rice/ksb/messaging/ExceptionRetryCountTest.java Conflict discovered in 'it/ksb/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/ksb/pom.xml Conflict discovered in 'it/kim/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/kim/pom.xml Conflict discovered in 'it/impl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/impl/pom.xml U it/krad/src/test/java/org/kuali/rice/krad/service/BusinessObjectServiceTest.java U it/krad/src/test/java/org/kuali/rice/krad/impls/MockWorkflowDocument.java U it/krad/src/test/java/org/kuali/rice/krad/workflow/DataDictionarySearchableAttributeTest.java Conflict discovered in 'it/krad/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/krad/pom.xml Conflict discovered in 'it/edl/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/edl/pom.xml U it/kew/src/test/java/org/kuali/rice/kew/server/WorkflowUtilityTest.java U it/kew/src/test/java/org/kuali/rice/kew/clientapp/WorkflowDocumentTest.java U it/kew/src/test/java/org/kuali/rice/kew/docsearch/SearchableAttributeTest.java U it/kew/src/test/java/org/kuali/rice/kew/actions/ReturnToPreviousNodeActionTest.java U it/kew/src/test/java/org/kuali/rice/kew/rule/xmlrouting/StandardGenericXMLRuleAttributeTest.java Conflict discovered in 'it/kew/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/kew/pom.xml Conflict discovered in 'it/core/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/core/pom.xml Conflict discovered in 'it/location/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/location/pom.xml Conflict discovered in 'it/internal-tools/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/internal-tools/pom.xml Conflict discovered in 'it/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/pom.xml U it/remote/src/test/groovy/org/kuali/rice/ken/service/SendNotificationServiceRemoteTest.groovy Conflict discovered in 'it/remote/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/remote/pom.xml Conflict discovered in 'it/krms/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/krms/pom.xml U it/ken/src/test/java/org/kuali/rice/ken/test/TestConstants.java U it/ken/src/test/java/org/kuali/rice/ken/test/util/MockObjectsUtil.java U it/ken/src/test/java/org/kuali/rice/ken/dao/UserChannelSubscriptionDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationChannelDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/BusinessObjectDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationContentTypeDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationRecipientListDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationChannelReviewerDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationPriorityDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/dao/NotificationProducerDaoTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/UserPreferenceServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageDeliveryServiceImplTest.java A it/ken/src/test/java/org/kuali/rice/ken/services/impl/SendNotificationServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageDeliveryResolverServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationContentTypeServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationMessageContentServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/services/impl/NotificationAuthorizationServiceImplTest.java U it/ken/src/test/java/org/kuali/rice/ken/core/TestOJBTest.java Conflict discovered in 'it/ken/pom.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C it/ken/pom.xml Summary of conflicts: Text conflicts: 80 gilesp@monolith:~/workspaces/rice-ws/merge/trunk$

          People

          • Assignee:
            Peter Giles (Inactive)
            Reporter:
            Jeremy Hanson
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Structure Helper Panel