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:
- QA Tool for Nominatim. Helps to improve the OpenStreetMap data quality and therefore the Nominatim search results.☆14Nov 12, 2025Updated 5 months ago
- A pasta with list if communicators, to use when someone from your friends circle starts nagging about switching communicators.☆15Aug 27, 2020Updated 5 years ago
- Vim plugin for highlighting SQL inside JavaScript template literals☆13May 6, 2021Updated 4 years ago
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- An alternative to OpenStreetMap user's notes page + web UI for OSM note search API☆20Jul 23, 2025Updated 9 months ago
- Simple, predictable pricing with DigitalOcean hosting • AdAlways know what you'll pay with monthly caps and flat pricing. Enterprise-grade infrastructure trusted by 600k+ customers.
- Terminal and Repl Extensions - for neovim☆18May 12, 2021Updated 4 years ago
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 5 years ago
- Safely shutdown http://hapijs.com servers.☆25Nov 15, 2025Updated 5 months ago
- 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
- A calculator for production facility ratios in Factorio☆26Jun 18, 2023Updated 2 years ago
- Highlighting of searches via star, auto-highlighting.☆16Mar 14, 2023Updated 3 years ago
- Android UI element for displaying and editing an opening hours value☆10Apr 20, 2026Updated 2 weeks ago
- username, email and password in – token out.☆13Mar 8, 2017Updated 9 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.
- Todo management in vim using unite and sqlite☆19Mar 28, 2019Updated 7 years ago
- Handle tickets against osm-fr infrastructure☆22Mar 10, 2026Updated last month
- 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
- generate a high resolution, deep mandelbrot zoom☆11Jan 26, 2021Updated 5 years ago
- Arbitrary Command Output Colourer☆23Jul 11, 2014Updated 11 years ago
- Convert GeoJSON geometry paths to SVG polyline elements.☆18Oct 11, 2022Updated 3 years ago
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- Emmet LiveStyle for Vim☆108Oct 12, 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.
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 years ago
- Subway Preprocessor and Validator☆28Oct 13, 2020Updated 5 years ago
- This ohsome R package grants access to the power of the ohsome API from R.☆12Oct 4, 2023Updated 2 years ago
- Hologit lets you declaratively define virtual sub-branches within any Git branch☆20Apr 21, 2026Updated last week
- 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
- 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
- Bitwarden client applications (web, browser extension, desktop, and cli)☆16Jun 25, 2025Updated 10 months 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.
- 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
- Design files for a parametric, wooden, CNC-millable desk.☆16Mar 24, 2017Updated 9 years ago
- A collection of functions which operate on 32-bit signed integers☆12Oct 27, 2024Updated last year
- QueryConnector - Attach queries on OpenOffice/LibreOffice Calc spreadsheet documents.☆11Jun 9, 2025Updated 10 months ago
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 8 years ago