Install: https://download.tortoisegit.org/tgit/ and download the Latest stable release

Defaults

If you receive this message just select ignore and do the update step at the end.

• Show Whole Project = true

Setup

Config

Config VS Diff merge tool

Diff

C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine

Merge

C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m

Cloning a repository

Creating a branch

Switching branches

Merge Conflicts