Using FileMerge to resolve conflicts
Default software is sometimes the best way to go
4 min readJul 22, 2019
The use different comparison tools can be a tricky decision. However FileMerge is bundled with Xcode and uses easy navigation, syntax-based colouring and the ability to merge in changes.
Prerequisites:
- Some knowledge of Git
Terminology
Git: Git is a distributed version-control system for tracking changes in source code during software development
