joelgriffith / sickmerge Goto Github PK

Add unit tests into the package, which will likely require a small refactor to make the code more testable.

This is a larger milestone, but sickmerge should be able to accept multiple files (in one browser panel) to merge. If there is multiple files, the user should be able to click a "save-all" button as well as the save button that is already there.

jQuery is adding ~100kb to the final client payload, and does little. Refactor to remove it.

A three way merge is a merge that uses the common ancestor between the local and the remote branches for merging, but this utility doesn't do that while it's described as a 3-way merge tool in the npm page.

When no syntax is specified, sickmerge should "guess" which to apply

Can you supply a non-minified JS version so I can help debug?