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:
- QA Tool for Nominatim. Helps to improve the OpenStreetMap data quality and therefore the Nominatim search results.☆14Jun 10, 2026Updated last month
- 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 5 years ago
- An alternative to OpenStreetMap user's notes page + web UI for OSM note search API☆20Jul 23, 2025Updated last year
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆16Aug 7, 2019Updated 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.
- The Colouring Cities Research Programme's Open Manual/Wiki☆10Sep 16, 2024Updated last year
- Fixing (multi)polygons in OpenStreetMap☆25Jun 4, 2022Updated 4 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
- Android UI element for displaying and editing an opening hours value☆10Apr 20, 2026Updated 3 months ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- ☆14Oct 15, 2019Updated 6 years ago
- Beeminder gem for convenient access to the API☆13Jan 9, 2026Updated 6 months ago
- Arbitrarily split your Webpack chunks and bundles into smaller pieces☆15Feb 21, 2021Updated 5 years ago
- AI Agents on DigitalOcean Gradient AI Platform • AdBuild production-ready AI agents using customizable tools or access multiple LLMs through a single endpoint. Create custom knowledge bases or connect external data.
- ☆15Apr 22, 2026Updated 3 months ago
- printable calendar maker, using CSS☆12Dec 5, 2015Updated 10 years ago
- generate a high resolution, deep mandelbrot zoom☆12Jan 26, 2021Updated 5 years ago
- Convert GeoJSON geometry paths to SVG polyline elements.☆18Oct 11, 2022Updated 3 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 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
- A decorator to make class properties reactive with Vue.js☆14Dec 25, 2021Updated 4 years ago
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 9 years ago
- Deploy on Railway without the complexity - Free Credits Offer • AdConnect your repo and Railway handles the rest with instant previews. Quickly provision container image services, databases, and storage volumes.
- Conversion of TfL CID attributes to OSM☆11Apr 11, 2023Updated 3 years ago
- Design files for a parametric, wooden, CNC-millable desk.☆17Mar 24, 2017Updated 9 years ago
- QueryConnector - Attach queries on OpenOffice/LibreOffice Calc spreadsheet documents.☆11Jun 9, 2025Updated last year
- A tactile display for the blind.☆20Jun 22, 2019Updated 7 years ago
- 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.☆11Jun 16, 2026Updated last month
- A set of scripts to count OSM editor usage stats☆13Dec 6, 2025Updated 7 months ago
- A basic class to encrypt and decrypt☆17Jan 4, 2021Updated 5 years ago
- vim port of highlightparentheses.el☆25Mar 27, 2018Updated 8 years ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- Detect bots via user-agent. (Am I bot?)☆10Dec 25, 2021Updated 4 years ago
- Timber.io Rust musl toolchain☆10Nov 11, 2019Updated 6 years ago
- Organizing test by unit test, quick integration or slow integration.☆25Apr 7, 2023Updated 3 years ago
- Jump to anywhere using any motion in all modes: Lightweight alternative to vim-easymotion☆20Jun 6, 2023Updated 3 years ago
- asyncfinder.vim - simple asynchronous fuzzy file finder for vim☆26Nov 10, 2020Updated 5 years ago
- Check your caching layer before running your promises☆13Jan 5, 2023Updated 3 years ago
- 💬 Tooltips with just CSS ~1kb☆12Sep 12, 2024Updated last year