Alt + Shift + M (Mac: ⌥⇧M)): This will first select the two files you want to merge. Pressing the
OKbutton opens an editor showing the difference between the two source codes.
Alt + Shift + = (Mac: ⌥⇧ =)): Moves to the next closest difference from the current cursor. The background color changes when the difference is selected.
Alt + Shift +-(Mac: ⌥⇧-)): Moves to the previous closest difference from the current cursor. The background color changes when the difference is selected.
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.
=><=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.
savebutton. The editor on the right cannot be modified. The code merge window will be closed once you press