Product documentation Docs
    • English
    • Deutsch
    • 日本語
    • 한국어
    • Français
  • More Sites
    • Now Community
    • Developer Site
    • Knowledge Base
    • Product Information
    • ServiceNow.com
    • Training
    • Customer Success Center
    • ServiceNow Support Videos
  • Log in

Product documentation

  • Home
How search works:
  • Punctuation and capital letters are ignored
  • Special characters like underscores (_) are removed
  • Known synonyms are applied
  • The most relevant topics (based on weighting and matching to search terms) are listed first in search results
Topics are ranked in search results by how closely they match your search terms
  • A match on the entire phrase you typed
  • A match on part of the phrase you typed
  • A match on ALL of the terms in the phrase you typed
  • A match on ANY of the terms in the phrase you typed

Note: Matches in titles are always highly ranked.

  • Release version
    Table of Contents
    • Now Platform App Engine
Table of Contents
Choose your release version
    Home Orlando Now Platform App Engine Now Platform App Engine Application tools Team Development Team Development overview Resolve a collision in Team Development

    Resolve a collision in Team Development

    • Save as PDF Selected topic Topic & subtopics All topics in contents
    • Unsubscribe Log in to subscribe to topics and get notified when content changes.
    • Share this page

    Resolve a collision in Team Development

    A collision is detected when the pulled version and the current local version are modifications of a different version, indicating that someone else has modified the same record that you have modified. The team dashboard displays the number of collisions between the local and the parent instance.

    About this task

    To ensure that your changes do not conflict with other development efforts, you should resolve collisions as soon as they are identified. You must resolve all collisions before you can pull or push.

    Procedure

    1. Navigate to Team Development > Team Dashboard.
    2. In the control panel, click Collisions or click the count of collisions. A list of collisions opens.
    3. Right-click a row and select Resolve Collision. (Alternatively, open the record and click the Resolve Collision related link.) The Resolve Collision page displays a comparison between the version that was pulled from the parent and your local record. The page highlights the differences.
    4. Review the differences. You have the following options:
      OptionAction
      To maintain the local record as the current version Click Use Local Version. The pulled version is added to the version history for the record.
      To load the version pulled from the parent as the current version Click Use Pulled Version.
      To move a setting from the selected version to update the current version
      Note: Some types of record do not support this method. See Limitations on updating records for more information.
      To move a change, click the > (Move Right) button for the field. To work with scripts and text fields, click in the field and modify the text as needed. When the records meet your needs, click Save Merge and Resolve Collision.
      The system performs that action and also clears the collision for future push/pulls.
    5. Repeat the process for every remaining collision.

    Result

    The system saves the merged changes and resolves the collision.
    Related tasks
    • Approve or reject a push
    • Back out a local change
    • Cancel a code review request
    • Change the parent instance
    • Check the review status of a pushed change
    • Compare a pushed version to a local version
    • Compare to peer instances
    • Ignore a local change
    • Pull a version
    • Push a version
    • Back out a push
    • Queue a local change for a push
    • Reconcile changes
    • Resolve multiple collisions
    • Compare to the current version
    • Compare a pushed version to a local version
    • Compare two versions of an article
    • Resolve conflicts for an individual record
    • Revert a change
    • View customizations and compare with current version
    Related concepts
    • Local changes
    • Local change lists
    Related reference
    • When to use Team Development
    • Pull exceptions
    • Team dashboard
    • Limitations on updating records

    Tags:

    Feedback
    On this page

    Previous topic

    Next topic

    • Contact Us
    • Careers
    • Terms of Use
    • Privacy Statement
    • Sitemap
    • © ServiceNow. All rights reserved.

    Release version
    Choose your release version

      Resolve a collision in Team Development

      • Save as PDF Selected topic Topic & subtopics All topics in contents
      • Unsubscribe Log in to subscribe to topics and get notified when content changes.
      • Share this page

      Resolve a collision in Team Development

      A collision is detected when the pulled version and the current local version are modifications of a different version, indicating that someone else has modified the same record that you have modified. The team dashboard displays the number of collisions between the local and the parent instance.

      About this task

      To ensure that your changes do not conflict with other development efforts, you should resolve collisions as soon as they are identified. You must resolve all collisions before you can pull or push.

      Procedure

      1. Navigate to Team Development > Team Dashboard.
      2. In the control panel, click Collisions or click the count of collisions. A list of collisions opens.
      3. Right-click a row and select Resolve Collision. (Alternatively, open the record and click the Resolve Collision related link.) The Resolve Collision page displays a comparison between the version that was pulled from the parent and your local record. The page highlights the differences.
      4. Review the differences. You have the following options:
        OptionAction
        To maintain the local record as the current version Click Use Local Version. The pulled version is added to the version history for the record.
        To load the version pulled from the parent as the current version Click Use Pulled Version.
        To move a setting from the selected version to update the current version
        Note: Some types of record do not support this method. See Limitations on updating records for more information.
        To move a change, click the > (Move Right) button for the field. To work with scripts and text fields, click in the field and modify the text as needed. When the records meet your needs, click Save Merge and Resolve Collision.
        The system performs that action and also clears the collision for future push/pulls.
      5. Repeat the process for every remaining collision.

      Result

      The system saves the merged changes and resolves the collision.
      Related tasks
      • Approve or reject a push
      • Back out a local change
      • Cancel a code review request
      • Change the parent instance
      • Check the review status of a pushed change
      • Compare a pushed version to a local version
      • Compare to peer instances
      • Ignore a local change
      • Pull a version
      • Push a version
      • Back out a push
      • Queue a local change for a push
      • Reconcile changes
      • Resolve multiple collisions
      • Compare to the current version
      • Compare a pushed version to a local version
      • Compare two versions of an article
      • Resolve conflicts for an individual record
      • Revert a change
      • View customizations and compare with current version
      Related concepts
      • Local changes
      • Local change lists
      Related reference
      • When to use Team Development
      • Pull exceptions
      • Team dashboard
      • Limitations on updating records

      Tags:

      Feedback

          Share this page

          Got it! Feel free to add a comment
          To share your product suggestions, visit the Idea Portal.
          Please let us know how to improve this content

          Check any that apply

          To share your product suggestions, visit the Idea Portal.
          Confirm

          We were unable to find "Coaching" in Jakarta. Would you like to search instead?

          No Yes
          • Contact Us
          • Careers
          • Terms of Use
          • Privacy Statement
          • Sitemap
          • © ServiceNow. All rights reserved.

          Subscribe Subscribed Unsubscribe Last updated: Tags: January February March April May June July August September October November December No Results Found Versions Search preferences successfully updated My release version successfully updated My release version successfully deleted An error has occurred. Please try again later. You have been unsubscribed from all topics. You are now subscribed to and will receive notifications if any changes are made to this page. You have been unsubscribed from this content Thank you for your feedback. Form temporarily unavailable. Please try again or contact  docfeedback@servicenow.com  to submit your comments. The topic you requested does not exist in the release. You were redirected to a related topic instead. The available release versions for this topic are listed There is no specific version for this documentation. Explore products Click to go to the page. Release notes and upgrades Click to open the dropdown menu. Delete Remove No selected version Reset This field is required You are already subscribed to this topic Attach screenshot The file you uploaded exceeds the allowed file size of 20MB. Please try again with a smaller file. Please complete the reCAPTCHA step to attach a screenshot
          Log in to personalize your search results and subscribe to topics
          No, thanks Login