Changes for page tortoisegit
Last modified by Gideon Lombard on 2023/09/18 11:50
Change comment:
Uploaded new attachment "1657110803212-629.png", version {1}
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Attachments (0 modified, 11 added, 0 removed)
Details
- Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. rudim1 +XWiki.gideonl - Content
-
... ... @@ -2,15 +2,52 @@ 2 2 3 3 Install: [[https:~~/~~/download.tortoisegit.org/tgit/2.13.0.0/TortoiseGit-2.13.0.1-64bit.msi>>https://download.tortoisegit.org/tgit/2.13.0.0/TortoiseGit-2.13.0.1-64bit.msi]] 4 4 5 += Defaults = 5 5 6 - Setup7 +[[image:1657110518542-869.png]] 7 7 8 -Cloning a repository 9 9 10 - Creatingabranch10 +[[image:1657110530030-642.png]] 11 11 12 - Switching branches12 +[[image:1657110561627-201.png]] 13 13 14 - MergeConflicts14 +[[image:1657110590445-522.png]] 15 15 16 +[[image:1657110612649-187.png]] 17 + 18 + 19 + 20 +* Show Whole Project = true 21 + 22 += Setup = 23 + 24 +== == 25 + 26 +== Config == 27 + 28 +=== Config VS Diff merge tool === 29 + 30 + 31 +Diff 32 + 33 +[[image:image-20220412120648-1.jpeg]] 34 + 35 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine 36 + 37 + 38 +Merge 39 + 40 +[[image:image-20220412120710-2.png]] 41 + 42 + 43 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m 44 + 45 +== Cloning a repository == 46 + 47 +== Creating a branch == 48 + 49 +== Switching branches == 50 + 51 +== Merge Conflicts == 52 + 16 16
- 1657110471740-132.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +65.1 KB - Content
- 1657110496897-136.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +82.4 KB - Content
- 1657110518542-869.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +68.4 KB - Content
- 1657110530030-642.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +82.9 KB - Content
- 1657110561627-201.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +223.2 KB - Content
- 1657110590445-522.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +34.4 KB - Content
- 1657110612649-187.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +22.9 KB - Content
- 1657110765365-816.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +33.2 KB - Content
- 1657110803212-629.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.gideonl - Size
-
... ... @@ -1,0 +1,1 @@ 1 +53.3 KB - Content
- image-20220412120648-1.jpeg
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.rudim - Size
-
... ... @@ -1,0 +1,1 @@ 1 +63.4 KB - Content
- image-20220412120710-2.png
-
- Author
-
... ... @@ -1,0 +1,1 @@ 1 +XWiki.rudim - Size
-
... ... @@ -1,0 +1,1 @@ 1 +86.8 KB - Content