Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆52Jan 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:
- A reusable React isomorphic error boundary for React 16+☆10Sep 17, 2020Updated 5 years ago
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- Terminal and Repl Extensions - for neovim☆18May 12, 2021Updated 4 years ago
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 5 years ago
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆15Aug 7, 2019Updated 6 years ago
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- Use the "lightbulb" action menu (think Visual Studio Code) within vim☆11Jun 25, 2019Updated 6 years ago
- Highlighting of searches via star, auto-highlighting.☆16Mar 14, 2023Updated 3 years ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- command-line json inspector☆296Feb 28, 2015Updated 11 years ago
- Arbitrarily split your Webpack chunks and bundles into smaller pieces☆15Feb 21, 2021Updated 5 years ago
- ☆11Aug 8, 2016Updated 9 years ago
- Original Apollo 11 guidance computer (AGC) source code digitized by folks at Virtual AGC (http://www.ibiblio.org/apollo/) and MIT Museum.☆13Aug 15, 2016Updated 9 years ago
- retire your mouse.☆18Nov 20, 2021Updated 4 years ago
- Arbitrary Command Output Colourer☆23Jul 11, 2014Updated 11 years ago
- Serverless GPU API endpoints on Runpod - Bonus Credits • AdSkip the infrastructure headaches. Auto-scaling, pay-as-you-go, no-ops approach lets you focus on innovating your application.
- Emmet LiveStyle for Vim☆108Oct 12, 2018Updated 7 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 3 years ago
- A decorator to make class properties reactive with Vue.js☆14Dec 25, 2021Updated 4 years ago
- REPL Client (rc)☆33Sep 13, 2020Updated 5 years ago
- JCS (JSON Canonicalization Scheme), JSON digests, and JSON Merkle hashes☆16Mar 10, 2024Updated 2 years ago
- A Sublime Text package to create build systems running in WSL2☆11Dec 24, 2023Updated 2 years ago
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 7 years ago
- Bitwarden client applications (web, browser extension, desktop, and cli)☆16Jun 25, 2025Updated 9 months ago
- Generate various kinds of Git conflicts, including conflicts suitable to interactively test a merge resolution tool. More fun stuff at: h…☆22Mar 23, 2023Updated 3 years ago
- 1-Click AI Models by DigitalOcean Gradient • AdDeploy popular AI models on DigitalOcean Gradient GPU virtual machines with just a single click. Zero configuration with optimized deployments.
- A set of `jq` scripts used to extract useful data from WebPageTest.☆17Oct 13, 2020Updated 5 years ago
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 years ago
- A collection of functions which operate on 32-bit signed integers☆12Oct 27, 2024Updated last year
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 years ago
- Tool for analyzing the output of `tsc --generateTrace`☆42Jan 14, 2022Updated 4 years ago
- Some of my configuration files for linux tools like bash, vim, screen, git, etc.☆32Mar 30, 2026Updated 2 weeks ago
- MipScope is a cross-platform IDE for students learning assembly on the MIPS architecture. The focus is on a convenient debugging environm…☆17May 11, 2024Updated last year
- node.js module for extracting text from html, pdf, doc, docx, xls, xlsx, csv, pptx, png, jpg, gif, rtf and more!☆11Aug 18, 2023Updated 2 years ago
- A command-line code search tool based on Tree-sitter☆39Oct 16, 2018Updated 7 years ago
- Managed Database hosting by DigitalOcean • AdPostgreSQL, MySQL, MongoDB, Kafka, Valkey, and OpenSearch available. Automatically scale up storage and focus on building your apps.
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11Mar 29, 2026Updated 2 weeks ago
- A Django mixin to raise a metered registration wall☆10Aug 30, 2017Updated 8 years ago
- Internal utility that builds SQL queries from Waterline statements using Knex (used by machinepack-mysql and machinepack-postgresql)☆14Mar 20, 2023Updated 3 years ago
- Promise based Fastly API client for Node.js☆16Updated this week
- GitBook API client in GO (golang)☆25Mar 24, 2016Updated 10 years ago
- ☆13Mar 24, 2017Updated 9 years ago
- Simple and opinionated Pino-based logger plugin for Hapi.js.☆13Aug 1, 2024Updated last year