Xcode compares the two branches with the same file, while xcode compares the two branches.

Xcode compares the two branches with the same file, while xcode compares the two branches.

For the two branches of the same project,Because both branches may have made some modifications.So the History... function in Source Control cannot be viewed, for example:

At this time, we need to use another function of xcode,

Procedure:

1. click the button marked as 1 in the red box in the figure. Two windows 3 and 4 (window 3 is the content of the current Branch file) are displayed in the middle of the page ).

2. Select a file with the same name from the xcode window of another branch, and then use "command +" to switch to the current xcode window.

3. Drag the file to the position marked in the red box in the image. Window 4 is the content of the file dragged over.

4. xcode will automatically mark different parts of the two files, so that you can easily view the differences between different branches and the same file.

Note: The application scenario is where both the two branches and the same file are modified.