Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • The Problem:
    • Several developers may make changes to bootstrap files at the same time and it is not clear how to merge these changes
  • The Solution:
    • In the Compare Config App, load one bootstrap file on the left and one on the right
    • Use the colored rows which highlight the differences to easily tell what one has that the other doesn't
    • Use actions supplied by the Compare Config App to quickly merge differences from one to the other
    • Use export actions supplied by the Compare Config App to quickly update the bootstrap files

Feature Overview

  • Load trees from JCR or files
  • Define root where to start
  • Select whether or not to ignore order and if so whether to display based on left or right tree order
  • Uses split view or
  • An app to compare and diff two different parts of the configuration tree, or two different configuration trees that can be loaded from file or the JCR
  • Uses either a split view or a collated view to display the trees being comparedcomparison
  • Use Uses row colors to show what is highlight differences between the trees
  • Can use the existing configuration tree in the JCR or load a tree from a previously exported to XML
  • Can pick the root for each tree to begin comparison from
  • Can define equivalences between nodes with different names in the two trees to treat them as if they have the same name
  • Can quickly create a node or property in one tree that the other tree has but this tree does not using actions
  • Can quickly navigate the differences one by one using actions
  • Can export modified trees to new XML files or update the original XML files
  • Equate nodes of different names so that their subtrees can be compared
  • Expand subtree of selected no intelligently to show all differences
  • Copy selected nodes from left to right or vice versa
  • Can export easilyCan choose which order (left or right) to go by or to highlight differences in order