Ecosyste.ms: Repos
An open API service providing repository metadata for many open source software ecosystems.
GitHub / jakub-g / git-resolve-conflict
:heavy_dollar_sign: :heavy_plus_sign: :heavy_minus_sign: :white_check_mark: Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
JSON API: https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/jakub-g%2Fgit-resolve-conflict
Stars: 51
Forks: 11
Open Issues: 4
License: mit
Language: Shell
Repo Size: 31.3 KB
Dependencies:
0
Created: almost 8 years ago
Updated: 2 months ago
Last pushed: almost 2 years ago
Last synced: 26 days ago
Topics: conflict-resolution, conflicting-changes, git, git-mergetools, merge-conflicts, resolve-conflicts
Files
No dependencies found