Works With Your Repository
Open your Git repo to view commits, branches and conflicted files.
Browse your repo's full history. Conflicting commits are helpfully labeled as OURS and THEIRS, making it easy to see which changes led to the conflict.
Select 2 commits to quickly compare their changes side-by-side.
CONFLICT (content): Merge conflict in complete-works/complete-works.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in complete-works/Shared/Model/Model.swift
Automatic merge failed; fix conflicts and then commit the result.
Command Line Integration
Launch diffs and merges right form the terminal with the
juxta command line tool.