#

conflicting-changes

Here is 1 public repository matching this topic...

jakub-g / git-resolve-conflict

💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)

git merge-conflicts conflict-resolution git-mergetools resolve-conflicts conflicting-changes

Updated Jan 20, 2025
Shell

Improve this page

Add a description, image, and links to the conflicting-changes topic page so that developers can more easily learn about it.

Curate this topic

Add this topic to your repo

To associate your repository with the conflicting-changes topic, visit your repo's landing page and select "manage topics."