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:
- Vim plugin for highlighting SQL inside JavaScript template literals☆13May 6, 2021Updated 5 years ago
- 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
- A calculator for production facility ratios in Factorio☆26Jun 18, 2023Updated 3 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.
- username, email and password in – token out.☆13Mar 8, 2017Updated 9 years ago
- This cli utility helps you harness the srtool docker image witout breaking a sweat.☆23Feb 27, 2025Updated last year
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- Handle tickets against osm-fr infrastructure☆22Aug 13, 2026Updated 3 weeks ago
- Original Apollo 11 guidance computer (AGC) source code digitized by folks at Virtual AGC (http://www.ibiblio.org/apollo/) and MIT Museum.☆12Aug 15, 2016Updated 10 years ago
- printable calendar maker, using CSS☆12Dec 5, 2015Updated 10 years ago
- Bashscript to convert Libreoffice Documents to Git Friendly Format☆14May 8, 2020Updated 6 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 years ago
- Automatically exported from code.google.com/p/vcf-to-csv-converter☆10Mar 18, 2015Updated 11 years ago
- End-to-end encrypted email - Proton Mail • AdSpecial offer: 40% Off Yearly / 80% Off First Month. All Proton services are open source and independently audited for security.
- Consume a stream until a given pattern is found☆12Feb 24, 2017Updated 9 years ago
- Private symbols for node.js☆14Jan 8, 2021Updated 5 years ago
- A command-line code search tool based on Tree-sitter☆40Oct 16, 2018Updated 7 years ago
- ☆15Feb 10, 2021Updated 5 years ago
- Scripts for creating OSM data derived data sets☆29Jul 21, 2025Updated last year
- Produces zero-dependencies node modules☆16Oct 25, 2016Updated 9 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 9 years ago
- An "England and Wales rural pedestrian" focused OSM-based map schema. Raster and vector examples at https://map.atownsend.org.uk/maps/ma…☆14Updated this week
- Tool for analyzing the output of `tsc --generateTrace`☆42Jan 14, 2022Updated 4 years ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- Design files for a parametric, wooden, CNC-millable desk.☆17Mar 24, 2017Updated 9 years ago
- 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
- Lint changed code stricter☆28Mar 7, 2023Updated 3 years ago
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11Jun 16, 2026Updated 2 months ago
- ☆15May 9, 2021Updated 5 years ago
- A set of scripts to count OSM editor usage stats☆13Dec 6, 2025Updated 8 months ago
- add extra files or dirs to webpack's watch system☆59Jun 1, 2020Updated 6 years ago
- A basic class to encrypt and decrypt☆17Jan 4, 2021Updated 5 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.
- Detect bots via user-agent. (Am I bot?)☆10Dec 25, 2021Updated 4 years ago
- Travis, CircleCI, et. al. env vars normalized☆13May 18, 2023Updated 3 years ago
- Timber.io Rust musl toolchain☆10Nov 11, 2019Updated 6 years ago
- Simple and opinionated Pino-based logger plugin for Hapi.js.☆13Aug 1, 2024Updated 2 years ago
- Jump to anywhere using any motion in all modes: Lightweight alternative to vim-easymotion☆20Jun 6, 2023Updated 3 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