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
- Safely shutdown http://hapijs.com servers.☆25Nov 15, 2025Updated 6 months ago
- 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.
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆15Aug 7, 2019Updated 6 years ago
- 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
- 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
- Test your web app in Android web view with visible console logs.☆26Nov 30, 2020Updated 5 years ago
- command-line json inspector☆296Feb 28, 2015Updated 11 years ago
- Substrate common app for Ledger hardware wallets☆11Sep 18, 2023Updated 2 years ago
- Open source password manager - Proton Pass • AdSecurely store, share, and autofill your credentials with Proton Pass, the end-to-end encrypted password manager trusted by millions.
- ☆11Aug 8, 2016Updated 9 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☆15Updated this week
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- Emmet LiveStyle for Vim☆108Oct 12, 2018Updated 7 years ago
- Produces zero-dependencies node modules☆16Oct 25, 2016Updated 9 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
- End-to-end encrypted cloud storage - Proton Drive • AdSpecial offer: 40% Off Yearly / 80% Off First Month. Protect your most important files, photos, and documents from prying eyes.
- Material for the 2017 May Institute☆13Jun 25, 2017Updated 8 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
- Valheim mod enabling you to plan buildings, copy structures and terraform☆17Mar 13, 2026Updated 2 months ago
- A set of `jq` scripts used to extract useful data from WebPageTest.☆17Oct 13, 2020Updated 5 years ago
- Completely native input power control tool written purely in C++ for performance and stability☆13Nov 20, 2019Updated 6 years ago
- Private symbols for node.js☆14Jan 8, 2021Updated 5 years ago
- ☆12Apr 4, 2024Updated 2 years ago
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 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 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
- 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.☆32Updated this week
- Map constraint satisfaction problems with binary variables to binary quadratic models.☆21Mar 18, 2025Updated last year
- A command-line code search tool based on Tree-sitter☆39Oct 16, 2018Updated 7 years ago
- A very opinionated but very convenient way to test Secure Scuttlebutt applications☆10Feb 5, 2018Updated 8 years ago