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 4 years ago
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- 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 4 months ago
- Use the "lightbulb" action menu (think Visual Studio Code) within vim☆11Jun 25, 2019Updated 6 years ago
- Stargazing for developers. A twinkling night sky with CSS/SVG/JS.☆16May 11, 2023Updated 2 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 6 years ago
- 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
- 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
- Arbitrary Command Output Colourer☆23Jul 11, 2014Updated 11 years ago
- Emmet LiveStyle for Vim☆108Oct 12, 2018Updated 7 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 3 years ago
- Hologit lets you declaratively define virtual sub-branches within any Git branch☆20Mar 14, 2026Updated last week
- Produces zero-dependencies node modules☆16Oct 25, 2016Updated 9 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
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 7 years ago
- Bitwarden client applications (web, browser extension, desktop, and cli)☆16Jun 25, 2025Updated 8 months ago
- In the Movie "-your name.-" (君の名は。, 你的名字) , "My Diary" of iOS version is. This repo inspired by erttyy8821.☆34May 20, 2017Updated 8 years ago
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 years ago
- Tool for analyzing the output of `tsc --generateTrace`☆42Jan 14, 2022Updated 4 years ago
- Some of my configuration files for linux tools like bash, vim, screen, git, etc.☆32Updated this week
- MipScope is a cross-platform IDE for students learning assembly on the MIPS architecture. The focus is on a convenient debugging environm…☆17May 11, 2024Updated last year
- A command-line code search tool based on Tree-sitter☆38Oct 16, 2018Updated 7 years ago
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11Updated this week
- Internal utility that builds SQL queries from Waterline statements using Knex (used by machinepack-mysql and machinepack-postgresql)☆14Mar 20, 2023Updated 3 years ago
- Scale Primus across multiple servers.☆30Sep 15, 2021Updated 4 years ago
- Knowledge Base System - Ready for Drupal 9 - a wiki system, and a documentation management system designed to host massive amount of cont…☆11Apr 7, 2025Updated 11 months ago
- Timber.io Rust musl toolchain☆10Nov 11, 2019Updated 6 years ago
- A simple tool to animate, unwind and explore WebPagetest filmstrips☆16Sep 25, 2019Updated 6 years ago
- ☆17Dec 22, 2011Updated 14 years ago
- An experimental Gtk-based fuzzy-finder (with support for neovim)☆22Oct 28, 2020Updated 5 years ago
- Travis, CircleCI, et. al. env vars normalized☆14May 18, 2023Updated 2 years ago
- Jump to anywhere using any motion in all modes: Lightweight alternative to vim-easymotion☆20Jun 6, 2023Updated 2 years ago
- Light and dark vim themes with colours inspired by the goddess mode comic series☆10Nov 11, 2024Updated last year
- Redux Saga based state machines☆12Jul 26, 2021Updated 4 years ago