Merge

Merges two source codes into one. When a conflict occurs in the version control, it can be used to resolve the conflict directly. You can easily see the difference between the two source codes.
The below functions are available in [Edit] > [Merge]. You can use shortcuts for more convenience.
Merge View (Alt + Shift + M (Mac: ⌥⇧M)): 
This will first select the two files you want to merge. 
Pressing the OK button opens an editor showing the difference between the two source codes.

Next Diff (Alt + Shift + = (Mac: ⌥⇧ =)): 
Moves to the next closest difference from the current cursor. 
The background color changes when the difference is selected.

Previous Diff (Alt + Shift +-(Mac: ⌥⇧-)): 
Moves to the previous closest difference from the current cursor. 
The background color changes when the difference is selected.

Merge Diff (Alt + Shift + / (Mac: ⌥⇧ /)): 
Overwrites the currently selected differences from the right editor to the left editor. 
You can also merge by clicking the arrow icon (<~) in the center of the merge editor. 
If no difference is selected, the first difference is merged.
You can use the =><= icon at the bottom center of the merge editor to group or unwind scrolls in both editors. 
As a default, both editors move together when you scrolled.
When you release the scroll, the scrolls in the editors move independently.
Merged content on the left side of the window can be saved by pressing save button.
The editor on the right cannot be modified. 
The code merge window will be closed once you press refresh.
Comment
Refactor
Last modified 3yr ago