Wiki source code of tortoisegit

Last modified by Gideon Lombard on 2023/09/18 11:50
Show last authors
1 First complete [[getting-started>>doc:technical-documentation.Source Control.getting-started.WebHome]] section before you start to install any client-tools
2
3 Install: [[https:~~/~~/download.tortoisegit.org/tgit/>>https://download.tortoisegit.org/tgit/]] and download the Latest stable release
4
5
6 [[image:1657115197554-401.png]]
7
8 = Defaults =
9
10 [[image:1657110518542-869.png]]
11
12
13 [[image:1657110530030-642.png]]
14
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
66