Sublimerge

跟不同人不得已改同一支檔案如何合併檔案呢？

在 Windows 可能會使用 WinMerge

在 Mac 可以在 Sublime 裝 Sublimerge 這個外掛用看看

安裝完後重開，比對檔案時只要使用上下左右鍵就可以輕鬆合併檔案囉！

官網 http://www.sublimerge.com/

Installation

1. Install the Package Control (if you haven't already)
2. Open Command Palette ([ctrl]+[shift]+[p] on Windows and Linux, [cmd]+[shift]+[p] on Mac)
3. Choose Package Control: Install Package
4. Search for Sublimerge Pro and hit [Enter]
5. Restart Sublime Text to complete the installation

Comparing local files

Please remember that if you want to compare two files, you can also select them in Side Bar and then use Sublimerge > Compare Selected Files command.

In files diff view

• [/] - display Differences Navigator
• [down] - select the next change (only single selection is possible)
• [up] - select the previous change (only single selection is possible)
• [left] - merge selected change(s) from right to left
• [right] - merge selected change(s) from left to right
• [shift]+[left] - merge all changes from right to left
• [shift]+[right] - merge all changes from left to right
• [ctrl]+[enter] - toggle edit mode (if available)

• Enter Edit Mode 

• Leave Edit Mode