Changes for page tortoisegit

Last modified by Gideon Lombard on 2023/09/18 11:50
<
From version < 1.2 >
edited by Rudi Marais
on 2022/03/01 12:30
To version < 25.1
edited by Gideon Lombard
on 2023/09/18 11:50
Change comment: There is no comment for this version

Summary

Details

Page properties
Parent
... ... @@ -1,1 +1,1 @@
1 -Technical Documentation.Source Control.client-tools.WebHome
1 +technical-documentation.Source Control.client-tools.WebHome
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.rudim
1 +XWiki.gideonl
Content
... ... @@ -1,16 +1,66 @@
1 -
1 +First complete [[getting-started>>doc:technical-documentation.Source Control.getting-started.WebHome]] section before you start to install any client-tools
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/]] and download the Latest stable release
4 4  
5 5  
6 -Setup
6 +[[image:1657115197554-401.png]]
7 7  
8 -Cloning a repository
8 += Defaults =
9 9  
10 -Creating a branch
10 +[[image:1657110518542-869.png]]
11 11  
12 -Switching branches
13 13  
14 -Merge Conflicts
13 +[[image:1657110530030-642.png]]
15 15  
15 +[[image:1657110561627-201.png]]
16 +
17 +[[image:1657110590445-522.png]]
18 +
19 +
20 +If you receive this message just select ignore and do the update step at the end.
21 +
22 +[[image:1657110612649-187.png]]
23 +
24 +
25 +**Complete your name and EBSphere e-mail address.**
26 +
27 +[[image:1657110765365-816.png]]
28 +
29 +[[image:1657110803212-629.png]]
30 +
31 +
32 +
33 +* Show Whole Project = true
34 +
35 += Setup =
36 +
37 +== ==
38 +
39 +== Config ==
40 +
41 +=== Config VS Diff merge tool ===
42 +
43 +
44 +Diff
45 +
46 +[[image:image-20220412120648-1.jpeg]]
47 +
48 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %base %mine
49 +
50 +
51 +Merge
52 +
53 +[[image:image-20220412120710-2.png]]
54 +
55 +
56 +C:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe %theirs %mine %base %merged /m
57 +
58 +== Cloning a repository ==
59 +
60 +== Creating a branch ==
61 +
62 +== Switching branches ==
63 +
64 +== Merge Conflicts ==
65 +
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
1657115197554-401.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +54.9 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: