3 ms·
even if you use the git CLI you can still set up a mergetool so that when you are resolving merge conflicts you can use something like BeyondCompare or P4Merge
by tcoff91 5y ago
even if you use the git CLI you can still set up a mergetool so that when you are resolving merge conflicts you can use something like BeyondCompare or P4Merge to handle the merge conflicts.
- Hamuko 5y agoAnd every Xcode installation on macOS comes with FileMerge.app.
- mixmastamyk 5y agoMeld