Wiki source code of tortoisegit

Version 16.3 by Gideon Lombard on 2022/07/06 12:36
Show last authors
1
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]]
4
5 = Defaults =
6
7 [[image:1657110518542-869.png]]
8
9
10 [[image:1657110530030-642.png]]
11
12 [[image:1657110561627-201.png]]
13
14 [[image:1657110590445-522.png]]
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
61