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:
- Sever/client clipboard over SSH for Neovim☆13Nov 13, 2016Updated 9 years ago
- Terminal and Repl Extensions - for neovim☆17May 12, 2021Updated 5 years ago
- Rapid editable EX command launcher.☆16Aug 8, 2020Updated 6 years ago
- Safely shutdown http://hapijs.com servers.☆25Nov 15, 2025Updated 9 months ago
- A neovim plugin for peeking at tag definitions using the `nvim_open_win` "floating window" feature.☆16Aug 7, 2019Updated 7 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- Use the "lightbulb" action menu (think Visual Studio Code) within vim☆11Jun 25, 2019Updated 7 years ago
- Stargazing for developers. A twinkling night sky with CSS/SVG/JS.☆16May 11, 2023Updated 3 years ago
- Highlighting of searches via star, auto-highlighting.☆16Mar 14, 2023Updated 3 years ago
- username, email and password in – token out.☆13Mar 8, 2017Updated 9 years ago
- Todo management in vim using unite and sqlite☆20Mar 28, 2019Updated 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.☆12Aug 15, 2016Updated 10 years ago
- ☆12Jan 25, 2023Updated 3 years ago
- PostCSS plugin to add text banner and footer to resulting file☆15May 2, 2022Updated 4 years ago
- Material for the 2017 May Institute☆13Jun 25, 2017Updated 9 years ago
- Wordpress hosting with auto-scaling - Free Trial Offer • AdFully Managed hosting for WordPress and WooCommerce businesses that need reliable, auto-scalable performance. Cloudways SafeUpdates now available.
- 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
- Desktop notifications for your GitHub dashboard — Native, cross-platform and configurable☆16Aug 29, 2018Updated 7 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
- Private symbols for node.js☆14Jan 8, 2021Updated 5 years ago
- In the Movie "-your name.-" (君の名は。, 你的名字) , "My Diary" of iOS version is. This repo inspired by erttyy8821.☆35May 20, 2017Updated 9 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 command-line code search tool based on Tree-sitter☆40Oct 16, 2018Updated 7 years ago
- Deploy to Railway using AI coding agents - Free Credits Offer • AdUse Claude Code, Codex, OpenCode, and more. Autonomous software development now has the infrastructure to match with Railway.
- A Sublime Text package to create build systems running in WSL2☆11Dec 24, 2023Updated 2 years ago
- A journey into the React codebase☆10Jun 27, 2017Updated 9 years ago
- Same as setTimeout and setInterval but pinned to the clock☆14Feb 15, 2020Updated 6 years ago
- MipScope is a cross-platform IDE for students learning assembly on the MIPS architecture. The focus is on a convenient debugging environm…☆16May 11, 2024Updated 2 years ago
- Tool for analyzing the output of `tsc --generateTrace`☆42Jan 14, 2022Updated 4 years ago
- A simple, minimal, flexible, forgiving, static, serializable, tagged union utility.☆11Jun 16, 2026Updated last month
- add extra files or dirs to webpack's watch system☆59Jun 1, 2020Updated 6 years ago
- ☆20Jul 10, 2026Updated last month
- vim port of highlightparentheses.el☆25Mar 27, 2018Updated 8 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.
- 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
- Internal utility that builds SQL queries from Waterline statements using Knex (used by machinepack-mysql and machinepack-postgresql)☆14Mar 20, 2023Updated 3 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
- asyncfinder.vim - simple asynchronous fuzzy file finder for vim☆26Nov 10, 2020Updated 5 years ago