💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
-
Updated
Jan 20, 2025 - Shell
💲 ➕ ➖ ✅ Resolve merge conflict from command line, in one file, using given strategy (--ours, --theirs, --union)
🤖 Gennadyᵇᵉᵗᵃ 🗯️ — GENeral Extensible Neural Network Adaptive Data Yntelligence.
To associate your repository with the resolve-conflicts topic, visit your repo's landing page and select "manage topics."