GitHub topics: resolve-conflicts
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)
Language: Shell - Size: 34.2 KB - Last synced at: 9 days ago - Pushed at: 3 months ago - Stars: 52 - Forks: 10
KidBourbon/resolve-merge-conflicts-course
Course about learning why conflicts happen and how to resolve them.
Size: 12.7 KB - Last synced at: almost 2 years ago - Pushed at: over 2 years ago - Stars: 0 - Forks: 0
