I use TortoiseGit, with default options, ie, merge with ff. Applicable for hot-fixes and small features. Branch Naming

If I want to compare changes on a topic branch to master, I find it easiest and safest to do...