each stationmaster more or less will make some code modification to the file, when patching the time if directly overwrites the patch file, then the code that has been modified before has no. So we need to do a code comparison and then synthesize a special patch package that retains both our previous modification code and the patch code, and then we need to use the file Contrast tool, which describes the way to compare code using beyond compare.
Beyond Compare is a classic and excellent professional-grade file comparison software, it makes it easy to compare the differences between two folders or files (such as code/Web pages/text files, and so on), and it will label each line or word that has a difference in color. Not only can you visually view and locate all the differences, but you can also easily modify them.
The specific steps are as follows:
Steps to download and install the Beyond compare software. The latest version of Beyond Compare 4 Chinese version can be downloaded in Beyond Compare Chinese website.
Step two to open beyond compare software, select the left "text comparison" and double-click;
Double-click the Text Compare button on the left side of the software interface
Step three in the Open text comparison session interface to the two code files to be compared to the left and right two boxes;
Example of dragging code files to the text comparison session interface
The four steps are automatically labeled as red when they are opened, as shown in the following figure.
Automatically mark the Difference section sample with red
The red in the small column to the left of step five is a different place in the entire code, as shown in the following figure;
Use red in the left sidebar to mark out the different parts of the code
Step six Drag the scroll bar, either horizontally or vertically on both sides of the code will be synchronized, browsing very carefree.