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:
- 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
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 5 years ago
- Highlighting of searches via star, auto-highlighting.☆16Mar 14, 2023Updated 3 years ago
- GPUs on demand by Runpod - Special Offer Available • AdRun AI, ML, and HPC workloads on powerful cloud GPUs—without limits or wasted spend. Deploy GPUs in under a minute and pay by the second.
- This cli utility helps you harness the srtool docker image witout breaking a sweat.☆23Feb 27, 2025Updated last year
- username, email and password in – token out.☆13Mar 8, 2017Updated 9 years ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- Arbitrarily split your Webpack chunks and bundles into smaller pieces☆15Feb 21, 2021Updated 5 years ago
- retire your mouse.☆18Nov 20, 2021Updated 4 years ago
- Arbitrary Command Output Colourer☆23Jul 11, 2014Updated 11 years ago
- html template library that supports streaming for javascript runtimes☆15May 20, 2026Updated 3 weeks ago
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- Emmet LiveStyle for Vim☆108Oct 12, 2018Updated 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.
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 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☆15Mar 10, 2024Updated 2 years ago
- Material for the 2017 May Institute☆13Jun 25, 2017Updated 8 years ago
- Compass mixin for using the dropshadow values that Photoshop uses. Making it easier to convert PSD files to CSS.☆117Apr 28, 2012Updated 14 years ago
- A Sublime Text package to create build systems running in WSL2☆11Dec 24, 2023Updated 2 years ago
- Consume a stream until a given pattern is found☆12Feb 24, 2017Updated 9 years ago
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 7 years ago
- Bare Metal GPUs on DigitalOcean Gradient AI • AdPurpose-built for serious AI teams training foundational models, running large-scale inference, and pushing the boundaries of what's possible.
- Python winternitz package. Contains (probably) post-quantum secure digital signature algorithms. Currently WOTS and WOTS+ are implemented☆15Mar 14, 2019Updated 7 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
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 years ago
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 8 years ago
- Some of my configuration files for linux tools like zsh, vim, git, etc.☆32Jun 7, 2026Updated last week
- 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 2 years ago
- A very opinionated but very convenient way to test Secure Scuttlebutt applications☆10Feb 5, 2018Updated 8 years ago
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11May 9, 2026Updated last month
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- Detect bots via user-agent. (Am I bot?)☆10Dec 25, 2021Updated 4 years ago
- ☆15May 9, 2021Updated 5 years ago
- 💬 Tooltips with just CSS ~1kb☆12Sep 12, 2024Updated last year
- Scale Primus across multiple servers.☆30Sep 15, 2021Updated 4 years ago
- vim port of highlightparentheses.el☆25Mar 27, 2018Updated 8 years ago
- Knowledge Base System - Ready for Drupal 9 - a wiki system, and a documentation management system designed to host massive amount of cont…☆11Apr 7, 2025Updated last year
- Travis, CircleCI, et. al. env vars normalized☆14May 18, 2023Updated 3 years ago