Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
Projects in Awesome Lists tagged with resolve-conflicts
A curated list of projects in awesome lists tagged with resolve-conflicts .
https://github.com/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)
conflict-resolution conflicting-changes git git-mergetools merge-conflicts resolve-conflicts
Last synced: 09 Nov 2024
