[brunobrito]

Thank you for mentioning Tower! I would just like to add that Tower 9 also included many improvements around the merge/rebase experience, including an Instant Conflict Detection that should satisfy the "preview" workflow mentioned.

Here's an example: https://imgur.com/a/VCkqrBI

More info here: https://www.git-tower.com/blog/tower-mac-9/#1-merge-improvem...