Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆51Jan 20, 2025Updated last year
Alternatives and similar repositories for git-resolve-conflict
Users that are interested in git-resolve-conflict are comparing it to the libraries listed below. We may earn a commission when you buy through links labeled 'Ad' on this page.
Sorting:
- Vim plugin for highlighting SQL inside JavaScript template literals☆13May 6, 2021Updated 5 years ago
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- ☆10Mar 21, 2018Updated 8 years ago
- Webpack standard eslint configuration☆14Updated this week
- Use the "lightbulb" action menu (think Visual Studio Code) within vim☆11Jun 25, 2019Updated 7 years ago
- Serverless GPU API endpoints on Runpod - Get Bonus Credits • AdSkip the infrastructure headaches. Auto-scaling, pay-as-you-go, no-ops approach lets you focus on innovating your application.
- ☆10Jul 29, 2022Updated 4 years ago
- username, email and password in – token out.☆13Mar 8, 2017Updated 9 years ago
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 6 years ago
- Highlighting of searches via star, auto-highlighting.☆16Oct 27, 2026Updated last week
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆16Aug 7, 2019Updated 7 years ago
- ☆14Oct 15, 2019Updated 7 years ago
- Original Apollo 11 guidance computer (AGC) source code digitized by folks at Virtual AGC (http://www.ibiblio.org/apollo/) and MIT Museum.☆12Aug 15, 2016Updated 10 years ago
- Automatically insert disable comments for failing TSLint rules☆10Dec 7, 2022Updated 3 years ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- Arbitrarily split your Webpack chunks and bundles into smaller pieces☆15Feb 21, 2021Updated 5 years ago
- Completely native input power control tool written purely in C++ for performance and stability☆13Nov 20, 2019Updated 6 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 years ago
- A web interface for monitoring and interacting with the PeachCloud device.☆11Jun 7, 2022Updated 4 years ago
- proof of concept of neat react + coffeescript integration☆11Apr 27, 2018Updated 8 years ago
- Convert longitude and latitude to a zipcode☆12Apr 15, 2019Updated 7 years ago
- JCS (JSON Canonicalization Scheme), JSON digests, and JSON Merkle hashes☆15Mar 10, 2024Updated 2 years ago
- Common Library for Node.js☆11Jan 8, 2026Updated 9 months ago
- Material for the 2017 May Institute☆13Jun 25, 2017Updated 9 years ago
- Deploy open-source AI quickly and easily - Special Bonus Offer • AdRunpod Hub is built for open source. One-click deployment and autoscaling endpoints without provisioning your own infrastructure.
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- Chef cookbook for nginx as a reverse proxy/SSL terminator☆11Feb 14, 2013Updated 13 years ago
- Consume a stream until a given pattern is found☆12Feb 24, 2017Updated 9 years ago
- Private symbols for node.js☆14Jan 8, 2021Updated 5 years ago
- A decorator to make class properties reactive with Vue.js☆14Dec 25, 2021Updated 4 years ago
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 years ago
- Docker Swarm Service Driller☆19Jun 7, 2017Updated 9 years ago
- A JavaScript implementation from scratch of an online gradient descent neural network using some functional programming principles.☆10Aug 31, 2019Updated 7 years ago
- Produces zero-dependencies node modules☆16Oct 25, 2016Updated 10 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- A pretty tail -f for docker logs from multiple containers☆19Apr 3, 2016Updated 10 years ago
- A tiny Vim plugin for loading template files.☆11Sep 18, 2019Updated 7 years ago
- ☆15May 9, 2021Updated 5 years ago
- Jump to anywhere using any motion in all modes: Lightweight alternative to vim-easymotion☆20Jun 6, 2023Updated 3 years ago
- ☆28Apr 5, 2021Updated 5 years ago
- An EcmaScript lexical scanner that is as correct as one can be and produces a token stream that any valid EcmaScript parser will unambigu…☆11Jul 6, 2017Updated 9 years ago
- Lint changed code stricter☆28Mar 7, 2023Updated 3 years ago