Tower can now automatically expand diffs in changesets. Just like any stash, you can write a message and find your work later under the 'Stashes' view.

To create a full snapshot, click on 'Working Copy > Create Snapshot'. To create a partial snapshot, select the desired changed file(s), right-click to access the context menu and click on 'Snapshot items'. Think of snapshots as stashes that are automatically re-applied to the working copy - so that you can immediately try out an idea with the assurance that your current state is safely stored under the 'Stashes' view. You can now create snapshots of your entire working copy or individual changed files. It even works after the file has been resolved! Restore the Unmerged Version of a File 2. If you messed up merging a file, you can restore the unmerged version by right-clicking on it and selecting 'Restore Merge Conflict Versions > Restore Unmerged Version of '. Edit the Commit Message When Rebasing Restore Unmerged Versions It is now possible to edit the commit message after resolving conflicts during a rebase or any other merge sequence, like cherry-picking or reverting multiple commits. In case it's a merge operation, you can either abort the merge or create an empty commit.

If there are no changes to commit, you can now either create an empty commit or skip it. Merge Conflict Detection Empty Merge Commitsĭuring a rebase operation, you may end up in a scenario where no files were changed. When merging another branch or revision (by merging, rebasing, or pulling), the dialog will instantly let you know if conflicts will occur. Let's look at the not-so-obvious merging refinements next. The new Merge UI may be the first novelty that catches your eye, but the merging overhaul goes much deeper. The icon, which you can also find in the sidebar, will be slightly different. In case of a rebase, you will see a progress bar so that you know which step you're currently in. The files will now also show “conflict” and “resolved” badges.įor even clearer visualization, you can click on 'Show only conflicts' to filter the conflicted files.

Right off the bat, you will notice that it indicates the number of unresolved conflicts between the two branches. This will be visible in every merge mode. Now, when a merge conflict pops up, you will notice a big yellow banner on top. It all starts with a brand-new Merge UI! The primary goal was to make it more explanatory and consistent for merge sequences and when editing revisions.

Git for mac 10.6.8