Changes for page tortoisegit

Last modified by Gideon Lombard on 2023/09/18 11:50
From version 1.1 >
edited by Rudi Marais
on 2022/02/26 14:36
To version < 16.5 >
edited by Gideon Lombard
on 2022/07/06 13:46
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.rudim
1 +XWiki.gideonl
Tags
... ... @@ -1,0 +1,1 @@
1 +TODO
Content
... ... @@ -1,16 +1,61 @@
1 1  
2 2  
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]]
3 +Install: [[https:~~/~~/download.tortoisegit.org/tgit/>>https://download.tortoisegit.org/tgit/]]
4 4  
5 += Defaults =
5 5  
6 -Setup
7 +[[image:1657110518542-869.png]]
7 7  
8 -Cloning a repository
9 9  
10 -Creating a branch
10 +[[image:1657110530030-642.png]]
11 11  
12 -Switching branches
12 +[[image:1657110561627-201.png]]
13 13  
14 -Merge Conflicts
14 +[[image:1657110590445-522.png]]
15 15  
16 +
17 +If you receive this message just select ignore and do the update step at the end.
18 +
19 +[[image:1657110612649-187.png]]
20 +
21 +
22 +[[image:1657110765365-816.png]]
23 +
24 +[[image:1657110803212-629.png]]
25 +
26 +
27 +
28 +* Show Whole Project = true
29 +
30 += Setup =
31 +
32 +== ==
33 +
34 +== Config ==
35 +
36 +=== Config VS Diff merge tool ===
37 +
38 +
39 +Diff
40 +
41 +[[image:image-20220412120648-1.jpeg]]
42 +
43 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine
44 +
45 +
46 +Merge
47 +
48 +[[image:image-20220412120710-2.png]]
49 +
50 +
51 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m
52 +
53 +== Cloning a repository ==
54 +
55 +== Creating a branch ==
56 +
57 +== Switching branches ==
58 +
59 +== Merge Conflicts ==
60 +
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

Applications

Navigation

Need help?

If you need help with XWiki you can contact: