Code Merging

Code Merging is an integrated Visual TFT feature that compares externally modified source file with the previous version of the file, presenting differences in a visual text format that is easy to understand and handle.
It is highly useful for determining what has changed between project versions, and then merging changes between versions.

When the file was externally modified (by means of some text editor) and user hits the Generate Code button Generate Code, Visual TFT will display following code merging window :

Code Merging Window

Code Merging window displays the two files in the left and right pane. In the left pane is externally modified source file, and in the right pane previous version of that file.

To move around the file differences, use Next Difference button Next Difference or Previous Difference button Previous Difference. To copy the current difference from one file to another, use Copy to Left button Copy to Left and Copy to Right button Copy to Right.
To copy all differences, use Copy All to Left button Copy All to Left or Copy All to Right button Copy All to Right.

After the files were merged, you can save them using the Save button Save Merged Files.

Copyright (c) 2002-2017 mikroElektronika. All rights reserved.
What do you think about this topic ? Send us feedback!