| Tower 9 for Mac has just been released. This 4-minute video covers everything you should know: https://youtu.be/CuCCGSlBkis Here's what's new — I'll be here if you have any questions! 1. Merge Improvements: - 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. - Instant Conflict Detection: when merging, the dialog will instantly let you know if conflicts will occur. - Restore Unmerged Versions of Files: developers can rollback accidental actions. - It is now possible to create empty commits (or skip them entirely) and edit commit messages after resolving conflicts. 2. Diffing improvements: - Auto-Expand Diffs in Changesets (you can set it to never, always, or for a number of items). - Large Diff Warnings (you can adjust the threshold in the Preferences, default is 20 kb). 3. New Features: - Snapshots: stashes that are automatically re-applied to the working copy (to quickly carry on with your work). - Reveal any commit, branch, or tag in Tower's "History" view. This is a free update for existing Tower users with a current subscription. New users can download a free 30-day trial. Also: Tower is free for students, teachers, educational institutions and non-profit organizations. |
Given the pricing model precludes ongoing use without ongoing payment, this would seem to be a rather disingenuous thing for them to say.