joelgriffith / sickmerge Goto Github PK
View Code? Open in Web Editor NEWSickmerge
License: MIT License
Sickmerge
License: MIT License
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.
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.
When no syntax is specified, sickmerge should "guess" which to apply
Add unit tests into the package, which will likely require a small refactor to make the code more testable.
jQuery is adding ~100kb to the final client payload, and does little. Refactor to remove it.
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.