ChangeBlocks

ChangeBlock nodes defines areas that have a change between:
  • Common and Incoming Repositories
  • Common and Existing Repositories
  • Incoming and Existing Repositories
There are three different types of ChangeBlocks:
  • Auto resolved – The ChangeBlock was able to be resolved and no conflicts exist.
  • Resolved – A user has already manually resolved the changeblock.
  • Pending – The Changeblock requires review due to conflicts. Typically this is custom content verses base content.

Select/Reject and Resolve

The Select and Resolve and reject and Resolve features provide a way to select a specific leg of the ChangeBlock and immediately resolve it. Right-click a ChangeBlock to display the options.