jakub-g / git-resolve-conflict
Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆52Updated last month
Alternatives and similar repositories for git-resolve-conflict:
Users that are interested in git-resolve-conflict are comparing it to the libraries listed below
- Bash plugin for Prettier☆39Updated 5 years ago
- Stylelint plugin for stylehacks linting☆14Updated last year
- Missing inspector for npm packages.☆56Updated 2 years ago
- ☆14Updated this week
- ESLint formatters published as standalone modules 🎉☆24Updated 8 months ago
- Get the version of a binary in semver format☆35Updated 10 months ago
- Find the root directory of a Node.js project or npm package☆25Updated last year
- Browser-action context menu to request permission for the current tab.☆72Updated 2 weeks ago
- ESLint Formatter featuring Git Author, Date, and Hash☆41Updated 2 years ago
- Get the current package's binary path☆36Updated 2 weeks ago
- ☆13Updated 2 years ago
- Download a specific version of Node.js☆20Updated 2 weeks ago
- Cascading, controlled-visibility options object management.☆40Updated 4 years ago
- Expands symbolic links and prints the resolved absolute filepath☆26Updated 9 months ago
- Get a directory for your caching needs☆26Updated last year
- Regular expression for matching issue references☆49Updated 4 months ago
- A curated list of awesome tiny browser libraries.☆24Updated 3 years ago
- Parse and normalize common terminal emulator color schemes☆35Updated 2 years ago
- Super-lightweight Promised wrapper around `chrome.*` API to be used in modules. Prefer `webextension-polyfill` if you’re using it directl…☆12Updated last year
- Import like with require but using await☆30Updated 3 years ago
- Mimic a Node.js HTTP response stream☆59Updated last year
- Check if a string has ANSI escape codes☆45Updated 7 months ago
- Get your internal IP address☆71Updated 3 years ago
- 🔇 mock stdio output for tests☆23Updated 6 years ago
- A better open. Reuse the same tab on Chromium-based browsers on macOS.☆42Updated 2 years ago
- Detect the indentation of code☆22Updated 3 years ago
- Linter that was originally part of kangax/html-minifier☆47Updated 8 years ago
- plugin to change links and images to references with separate definitions☆27Updated last year
- Check if a string is a URL☆85Updated last year
- Maps lines and columns to character offsets and back.☆24Updated last year