Resolving Git Conflicts
Check out Text Merging and Image Merging for the common basics of merging files.
The Context Shelf
When starting a conflict resolution via git, either by typing git mergetool or by using a Tool like Tower, you'll get an additional area on top of the file area, the context shelf.
There are three parts to the context shelf:
Summary
The area located in the middle for Block and Fluid views, and on the right for the Inline View shows a Summary of the current action leading to a conflict, like a merge between two branches (and their commits) or a cherry-pick.
Commit Information
Areas above A and B provide Git information about the commit that led to the conflict. The Information is organized like the entries of the File History.
Commit Details
Like in the File History, click a header area to show a popover with details about that commit.
In some cases, it may be helpful to contact the author of the commit. Clicking the name will open an email message with the email address provided as part of the commit.
Click the Open Changeset button to open the entire changeset for that commit. Often, this helps you understand more context about the change that led to the conflict. Also, from there you can investigate further by opening the File History for single files of that changeset.
Comparing Base to A or B (in Text Merge Conflicts)
Many typical Git Conflicts have a Base file, that's the common state of the conflicted file before the file started diverging in different branches.
Kaleidoscope offers to inspect the changes between this Base file and the A or B file. This comparison will be shown for a single conflict (or any type of change) in a popover located directly above the selected change.
Comparing the changes between Base and either A or B can often help understand the reasons for a conflict and help find the correct resolution.
Opening the Base to A Comparison
Open a text merge via
git mergetoolor an app integrating with Kaleidoscope.Navigate to a conflict.
Select View > Show Base to A Comparison, or click the “Toggle Base to A Comparison“ button in the middle area of the bottom toolbar.
Inside the popover that opens, click the “Compare Entire Files“ button to open the full Base to A comparison in a new tab of the current window.
Use the same steps, replaced with B, for the Base to B Comparison.
