simontate / conflict-find Goto Github PK
View Code? Open in Web Editor NEWMerge confict finder for Atom.
License: MIT License
Merge confict finder for Atom.
License: MIT License
I use MacOS at home and ctrl alt c (current bindings) are hard to press. An update to something else for Mac would be good.
Currently we can only move to the next conflict. Added functionality should be supported to go to the previous conflict.
Keybindings clash with default "copy path" keymap on Linux.
Cannot find next conflict with shortcut.
Pop up to user when no more conflicts are found after pressing shortcut.
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.