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.☆14Jun 10, 2026Updated 3 weeks ago
- A reusable React isomorphic error boundary for React 16+☆10Sep 17, 2020Updated 5 years ago
- Vim plugin for highlighting SQL inside JavaScript template literals☆13May 6, 2021Updated 5 years ago
- An Xposed module to add a "mark as read" option to Google Voice message notifications☆13Oct 12, 2022Updated 3 years ago
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- Managed Kubernetes at scale on DigitalOcean • AdDigitalOcean Kubernetes includes the control plane, bandwidth allowance, container registry, automatic updates, and more for free.
- Terminal and Repl Extensions - for neovim☆17May 12, 2021Updated 5 years ago
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 5 years ago
- The Colouring Cities Research Programme's Open Manual/Wiki☆10Sep 16, 2024Updated last year
- Safely shutdown http://hapijs.com servers.☆25Nov 15, 2025Updated 7 months ago
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆16Aug 7, 2019Updated 6 years ago
- Detects newline in your clipboard from tmux session☆14Nov 11, 2022Updated 3 years ago
- This cli utility helps you harness the srtool docker image witout breaking a sweat.☆23Feb 27, 2025Updated last year
- Android UI element for displaying and editing an opening hours value☆10Apr 20, 2026Updated 2 months ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 7 years ago
- Managed hosting for WordPress and PHP on Cloudways • AdManaged hosting for WordPress, Magento, Laravel, or PHP apps, on multiple cloud providers. Deploy in minutes on Cloudways by DigitalOcean.
- command-line json inspector☆296Feb 28, 2015Updated 11 years ago
- Some tutorials to help people learn how to program the D-Wave quantum computer.☆13Oct 4, 2018Updated 7 years ago
- Beeminder gem for convenient access to the API☆13Jan 9, 2026Updated 5 months ago
- Basic test of ES402 Intl object in Javascript.☆11Apr 9, 2016Updated 10 years ago
- 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
- Bashscript to convert Libreoffice Documents to Git Friendly Format☆14May 8, 2020Updated 6 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
- html template library that supports streaming for javascript runtimes☆15May 20, 2026Updated last month
- 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.
- STL Viewer☆16Mar 25, 2024Updated 2 years ago
- Emmet LiveStyle for Vim☆108Oct 12, 2018Updated 7 years ago
- A ruby gem that implements a file-based cache☆15Jan 9, 2023Updated 3 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 years ago
- Scripts for creating OSM data derived data sets☆29Jul 21, 2025Updated 11 months ago
- Hologit lets you declaratively define virtual sub-branches within any Git branch☆22Updated this week
- Produces zero-dependencies node modules☆16Oct 25, 2016Updated 9 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 9 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.
- 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
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 7 years ago
- Intercept API Requests and return Mocked Data☆16Apr 25, 2023Updated 3 years ago
- An efficient domain name availability bulk checker that looks for the presence of DNS Records before querying the Whois Server to save on…☆35Oct 26, 2010Updated 15 years ago
- ☆15Feb 10, 2021Updated 5 years ago
- Valheim mod enabling you to plan buildings, copy structures and terraform☆17Mar 13, 2026Updated 3 months ago