tortoisegit
Version 16.3 by Gideon Lombard on 2022/07/06 12:36
Install: https://download.tortoisegit.org/tgit/2.13.0.0/TortoiseGit-2.13.0.1-64bit.msi
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