A git command-line conflict resolution tool. In the browser.
npm install sickmerge
|2||downloads in the last week|
|2||downloads in the last month|
|Version||0.0.2 last updated 3 months ago|
|Keywords||sickmerge, git, merge, conflict, command-line, code-mirror, resolution|
|Dependencies (6)||express, ejs, code-mirror, jquery-browserify, commander, open|
A command-line git conflict resolution tool. In the browser.
Install the tool with:
npm install -g sickmerge
sickmerge [options] <conflicted-file>
How It Works
Sickmerge functions very similarly to a standard Node express application. After passing it your conflicted file, sickmerge will then build a 3-way merge window and start a small web service to deploy to. After you've made your changes (or hitting cancel), sickmerge will persist to contents to the original file and close the program.
You can then go about your normal git workflow and commit the resolved changes.
Sickmerge comes with numerous options and code-highlighting out-of-the-box. You can see the available options by running
sickmerge without any parameters. Below is more details on what each option does:
-h, --hostname [value]Optional. The host that you want to the browser to query for (useful if you're shelled in somewhere else). Defaults to
localhostsince it's likely you'll be using this the machine your coding from.
-p, --port [number]Optional. The port that you wish to deploy the service on. Defaults to 3000.
-m, --merge [value]Optional. The initial "merged" view strategy that you wish to display in the middle window. Options are 'yours', 'theirs' and 'both'. Defaults to 'yours'.
-s, --syntax [value]Optional. The language syntax you wish to use when viewing in the browser. To see a list of available syntaxes, run
sickmerge -o. Defaults to no syntax highlighting.
-o, --syntax-optionsPrints the available language syntaxes for code highlighting when in the browser.
- Standard usage
Loads conflict.js in the current location, and starts up a express app at
http://localhost:3000/ and opens your browser to that address.
- Using the port and hostname options
sickmerge -p 1337 -h hyrule conflict.js
Same as above, except this will deploy on port
1337 and open your browser to
- Using the syntax highlighting
A big thanks to the numerous libraries that this sits on. In no particular order: Node, Express, Commander, EJS, Webpack, Code-Mirror, and Diff-Patch-Match.
In lieu of a formal styleguide, take care to maintain the existing coding style. Be sure to lint your code and make sure it handles some edge-cases. In the near future, unit tests will be mandatory.
v0.0.1 - Initial release
Copyright (c) 2013 joelgriffith
Licensed under the MIT license.