jakub-g / git-resolve-conflict
Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
☆52Updated 2 years 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
- Group GitHub's news feed events by repo (Chrome, Firefox, Opera)☆15Updated 7 years ago
- ESLint Formatter featuring Git Author, Date, and Hash☆41Updated 2 years ago
- ☆54Updated 2 years ago
- Missing inspector for npm packages.☆56Updated last year
- Bash plugin for Prettier☆39Updated 5 years ago
- Analyze npm, hunt for es module packages☆35Updated 5 years ago
- Given one or many old yarn.lock, and one or many new yarn.lock, compute the diff.☆14Updated 2 years ago
- Columnated lists for the CLI. Unicode and ANSI safe.☆34Updated 3 years ago
- Transfer git url to web url☆24Updated last year
- ☆22Updated 6 years ago
- Cascading, controlled-visibility options object management.☆40Updated 4 years ago
- Get the version of a binary in semver format☆35Updated 9 months ago
- Find the root directory of a Node.js project or npm package☆25Updated last year
- Simplify eslint rules by visiting templates☆20Updated 2 years ago
- Simple wildcard matching☆34Updated 3 years ago
- Run programs with glob/globstar support, especially on Windows within npm scripts.☆21Updated last year
- Get a directory for your caching needs☆26Updated last year
- Expands symbolic links and prints the resolved absolute filepath☆26Updated 8 months ago
- Compare two software versions, with any number of points (<1KB)☆20Updated 2 years ago
- Get function arguments, useful for and used in dependency injectors. Works for regular functions, generator functions and arrow functions…☆20Updated 2 years ago
- Chrome extension - Show both Issues and Pull Requests in the Issues tab by default. As it previously did.☆52Updated 3 years ago
- Ensure that when you `npm publish`, the "latest" tag is only set for the truly latest version.☆21Updated 2 years ago
- ☆36Updated last year
- Generate badges for your readme☆27Updated 8 years ago
- Turn a Git URL into its canonical form.☆14Updated 4 years ago
- Regular expression for matching issue references☆49Updated 3 months ago
- Linter that was originally part of kangax/html-minifier☆47Updated 8 years ago
- Shorten GitHub links like GitHub shortens Issues and Commit links.☆82Updated 2 months ago
- ☆31Updated last year
- Node.js releases data☆36Updated last week