Tower 9 for Mac has just been released. This 4-minute video covers everything you should know: <a href="https://youtu.be/CuCCGSlBkis" rel="nofollow">https://youtu.be/CuCCGSlBkis</a><p>Here's what's new — I'll be here if you have any questions!<p>1. Merge Improvements:<p>- Merge UI: indicates the number of unresolved conflicts between two branches. Files now show badges depending on their status and it’s possible to view only conflicted files.<p>- Instant Conflict Detection: when merging, the dialog will instantly let you know if conflicts will occur.<p>- Restore Unmerged Versions of Files: developers can rollback accidental actions.<p>- It is now possible to create empty commits (or skip them entirely) and edit commit messages after resolving conflicts.<p>2. Diffing improvements:<p>- Auto-Expand Diffs in Changesets (you can set it to never, always, or for a number of items).<p>- Large Diff Warnings (you can adjust the threshold in the Preferences, default is 20 kb).<p>3. New Features:<p>- Snapshots: stashes that are automatically re-applied to the working copy (to quickly carry on with your work).<p>- Reveal any commit, branch, or tag in Tower's "History" view.<p>This is a free update for existing Tower users with a current subscription. New users can download a free 30-day trial.<p>Also: Tower is free for students, teachers, educational institutions and non-profit organizations.