jakub-g / git-resolve-conflict
Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆52Updated 2 months ago
Alternatives and similar repositories for git-resolve-conflict:
Users that are interested in git-resolve-conflict are comparing it to the libraries listed below
- Expands symbolic links and prints the resolved absolute filepath☆26Updated 10 months ago
- Cascading, controlled-visibility options object management.☆40Updated 4 years ago
- set blocking stdio and stderr ensuring that terminal output does not truncate☆38Updated last year
- Find semver versions in a string: `unicorn v1.2.3` → `1.2.3`☆45Updated 11 months ago
- Detect the indentation of code☆22Updated 3 years ago
- plugin to change links and images to references with separate definitions☆27Updated last year
- Run programs with glob/globstar support, especially on Windows within npm scripts.☆21Updated last year
- Simple wildcard matching☆34Updated 3 years ago
- Parse a GitHub URL for user/project@version☆30Updated 6 years ago
- Use `npx aud` instead of `npm audit`, whether you have a lockfile or not!☆26Updated 7 months ago
- convert back a yargs argv object to its original array form☆20Updated last year
- Determine if a function is an ES6 arrow function or not.☆22Updated 10 months ago
- Get a directory for your caching needs☆26Updated last year
- Find the root directory of a Node.js project or npm package☆25Updated last year
- Use 4 & 8 character hex color notation in CSS☆28Updated 3 years ago
- Log the value/error of a promise☆26Updated 3 years ago
- Check if something is a generator function☆22Updated 2 years ago
- Merge the DOM of 2 elements with the same textContent.☆33Updated 3 years ago
- News from the depths☆15Updated 3 years ago
- Regular expression for matching issue references☆49Updated 6 months ago
- Strip redundant indentation and indent the string☆54Updated 3 years ago
- Stylelint plugin for stylehacks linting☆14Updated last year
- Super-lightweight Promised wrapper around `chrome.*` API to be used in modules. Prefer `webextension-polyfill` if you’re using it directl…☆12Updated last year
- Get all emails in a text file or stdin☆24Updated 3 years ago
- Check if a string matches the name of a Node.js builtin module☆59Updated last month
- Extract the username from a git remote origin URL.☆17Updated 7 years ago
- ESLint Formatter featuring Git Author, Date, and Hash☆41Updated 2 years ago
- Check if a string has ANSI escape codes☆45Updated 8 months ago
- Track the list of currently unhandled promise rejections☆24Updated 6 years ago
- Proposal to standardize Date.parse behavior for interchange-like input☆32Updated last year