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
- Terminal and Repl Extensions - for neovim☆17May 12, 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
- 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.
- 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
- Arbitrarily split your Webpack chunks and bundles into smaller pieces☆15Feb 21, 2021Updated 5 years ago
- Consume a stream until a given pattern is found☆12Feb 24, 2017Updated 9 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
- Create prompts fast and easy☆40Nov 11, 2021Updated 4 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.
- A journey into the React codebase☆10Jun 27, 2017Updated 9 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
- 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
- A very opinionated but very convenient way to test Secure Scuttlebutt applications☆10Feb 5, 2018Updated 8 years ago
- ☆15May 9, 2021Updated 5 years ago
- A basic class to encrypt and decrypt☆17Jan 4, 2021Updated 5 years ago
- 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
- Simple and opinionated Pino-based logger plugin for Hapi.js.☆13Aug 1, 2024Updated 2 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.
- 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
- 💬 Tooltips with just CSS ~1kb☆12Sep 12, 2024Updated 2 years ago
- Check your caching layer before running your promises☆13Jan 5, 2023Updated 3 years ago
- Constructor name to nodeName or tagName and vice-versa☆12Sep 27, 2019Updated 6 years ago
- Redux Saga based state machines☆12Jul 26, 2021Updated 5 years ago
- Knowledge Base System - Ready for Drupal 9 - a wiki system, and a documentation management system designed to host massive amount of cont…☆11Aug 3, 2026Updated last month
- ☆12Jan 19, 2026Updated 8 months ago
- ☆28Apr 5, 2021Updated 5 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.
- React Finland 2022 XState Workshop☆11Sep 14, 2022Updated 4 years ago
- Sharedb PubSub module based on ws-bus (websocket bus)☆10Jan 12, 2017Updated 9 years ago
- HTTP-over-websocket layer for the Hapi web framework.☆11Nov 24, 2016Updated 9 years ago
- Enhance the native `gf` command to act like node-resolve☆10Dec 19, 2022Updated 3 years ago
- Documentation repo for NuGet localized for zh-cn language-culture☆10Mar 23, 2022Updated 4 years ago
- An SSR, islands friendly, way to render ube components.☆15Jun 29, 2021Updated 5 years ago
- Tools to help you get your twitter archive out of twitter☆10Mar 9, 2021Updated 5 years ago