jakub-g / git-resolve-conflict
Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆52Updated 3 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
Sorting:
- Bash plugin for Prettier☆39Updated 6 years ago
- Check if a string has ANSI escape codes☆47Updated 10 months ago
- Columnated lists for the CLI. Unicode and ANSI safe.☆36Updated 3 years ago
- Augment your ESLint rules in Visual Studio Code - Adds metadata beside each ESLint rule.☆42Updated 11 months ago
- convert back a yargs argv object to its original array form☆20Updated last year
- Strip comments from JSON. Lets you use comments in your JSON files!☆68Updated last year
- Run programs with glob/globstar support, especially on Windows within npm scripts.☆21Updated last year
- ESLint Formatter featuring Git Author, Date, and Hash☆41Updated 3 years ago
- Measure the difference between two strings using the Levenshtein distance algorithm☆47Updated 3 years ago
- Expands symbolic links and prints the resolved absolute filepath☆26Updated last year
- ☆54Updated 2 years ago
- Autocompletion support for `npm run`.☆54Updated 4 years ago
- bump regex with semver☆13Updated 4 years ago
- Produces zero-dependencies node modules☆17Updated 8 years ago
- Convert a file path to a file URL: `unicorn.jpg` → `file:///Users/sindresorhus/unicorn.jpg`☆61Updated last year
- Stylelint shareable config for XO☆41Updated 11 months ago
- Make a function mimic another one☆94Updated 6 months ago
- Maps lines and columns to character offsets and back.☆25Updated last year
- Stylelint shareable config for XO with 2-space indent☆13Updated last year
- Get the current package's binary path☆36Updated last month
- Linter that was originally part of kangax/html-minifier☆47Updated 8 years ago
- Strip redundant indentation and indent the string☆54Updated 4 years ago
- Check if something is a generator function☆22Updated 2 years ago
- Get a directory for your caching needs☆26Updated last year
- Display output from `xo` as a list of style errors, ordered by count☆35Updated 3 months ago
- Check if your code is running in a JXA environment☆31Updated 3 years ago
- A minimal ESLint custom formatter (reporter) that displays one summary line for all files processed.☆9Updated 9 years ago
- Use 4 & 8 character hex color notation in CSS☆28Updated 3 years ago
- Password input component for Ink☆16Updated 6 years ago
- Find semver versions in a string: `unicorn v1.2.3` → `1.2.3`☆45Updated last year