tortoisegit

Version 24.1 by Gideon Lombard on 2023/09/15 09:18

First complete getting-started section before you start to install any client-tools

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

1657115197554-401.png

Defaults

1657110518542-869.png

1657110530030-642.png

1657110561627-201.png

1657110590445-522.png

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

1657110612649-187.png

1657110765365-816.png

1657110803212-629.png

  • Show Whole Project = true

Setup

Config

Config VS Diff merge tool

Diff

image-20220412120648-1.jpeg

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

Merge

image-20220412120710-2.png

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

 

Tags: TODO
Created by Rudi Marais on 2022/02/26 14:36