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:
- A reusable React isomorphic error boundary for React 16+☆10Sep 17, 2020Updated 6 years ago
- 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
- Terminal and Repl Extensions - for neovim☆17May 12, 2021Updated 5 years ago
- Safely shutdown http://hapijs.com servers.☆25Nov 15, 2025Updated 10 months 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.
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆16Aug 7, 2019Updated 7 years ago
- Use the "lightbulb" action menu (think Visual Studio Code) within vim☆11Jun 25, 2019Updated 7 years ago
- Highlighting of searches via star, auto-highlighting.☆16Mar 14, 2023Updated 3 years ago
- <lqd> bikeshedding the name: something that is mapped folded and collected, a 🥐☆14Dec 12, 2019Updated 6 years ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- RFC6455 (The Websocket Protocol) protocol stack.☆12Sep 18, 2026Updated 3 weeks ago
- tRPC Azure Functions Adapter (Model V4)☆11Aug 21, 2024Updated 2 years ago
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 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 library to subscribe to GCM/FCM and receive notifications within a python application.☆17Jun 10, 2026Updated 4 months ago
- GramPay Commerce — Marketplace for sellers and buyers in TON Grams☆10Dec 12, 2022Updated 3 years ago
- Material for the 2017 May Institute☆13Jun 25, 2017Updated 9 years ago
- Atmel Pack parser, visualizer and fuse calculator☆12Dec 11, 2018Updated 7 years ago
- Consume a stream until a given pattern is found☆12Feb 24, 2017Updated 9 years ago
- Intercept API Requests and return Mocked Data☆16Apr 25, 2023Updated 3 years ago
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 8 years 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
- Private symbols for node.js☆14Jan 8, 2021Updated 5 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.
- ☆22Jun 18, 2024Updated 2 years ago
- Bitwarden client applications (web, browser extension, desktop, and cli)☆16Oct 4, 2026Updated last week
- A decorator to make class properties reactive with Vue.js☆14Dec 25, 2021Updated 4 years ago
- A command-line code search tool based on Tree-sitter☆40Oct 16, 2018Updated 7 years ago
- A Django application for listing your software projects.☆15Dec 8, 2020Updated 5 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 9 years ago
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 years ago
- MipScope is a cross-platform IDE for students learning assembly on the MIPS architecture. The focus is on a convenient debugging environm…☆16May 11, 2024Updated 2 years ago
- Strongly typed Advanced Custom Fields get_field function variants☆14Jun 4, 2020Updated 6 years ago
- Proton VPN Special Offer - Get 70% off • AdSpecial partner offer. Trusted by over 100 million users worldwide. Tested, Approved and Recommended by Experts.
- Tool for analyzing the output of `tsc --generateTrace`☆42Jan 14, 2022Updated 4 years ago
- A Django mixin to raise a metered registration wall☆10Aug 30, 2017Updated 9 years ago
- QueryConnector - Attach queries on OpenOffice/LibreOffice Calc spreadsheet documents.☆12Jun 9, 2025Updated last year
- A collection of functions which operate on 32-bit signed integers☆12Oct 27, 2024Updated last year
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11Sep 7, 2026Updated last month
- ☆15May 9, 2021Updated 5 years ago
- GitBook API client in GO (golang)☆25Mar 24, 2016Updated 10 years ago