The previous section described a generic way to achieve templates or snippets migration. Several other tools are available that can assist in migration. A good starting point is Wikipedia: Comparison of file comparison tools.
Some tools permit to realize a 3-ways merge by comparing three files at same time:
- Original file [i.e. gas-2.20/tpl/SetAjax/Image.xhtml]
- Modified file [i.e. gas-2.20/tpl/MyCustomSetAjax/Image.xhtml]
- Newer file [i.e. gas-2.21/tpl/SetAjax/Image.xhtml]
and enable you to create a merged version [i.e. gas-2.21/tpl/MyCustomSetAjax/Image.xhml]. Complete usage documentation of this kind of tool is beyond the scope of this section.
Example of a three-way merge with the Diffuse tool:
Figure 1. Diffuse tool for three-way merge