Wiki source code of tortoisegit
Version 17.1 by Gideon Lombard on 2022/07/06 13:46
Hide last authors
| author | version | line-number | content |
|---|---|---|---|
 |
1.1 | 1 | |
| 2 | |||
| |
16.5 | 3 | Install: [[https:~~/~~/download.tortoisegit.org/tgit/>>https://download.tortoisegit.org/tgit/]] |
| |
1.1 | 4 | |
| |
2.1 | 5 | = Defaults = |
| |
1.1 | 6 | |
| |
14.1 | 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.2 | 16 | |
| 17 | If you receive this message just select ignore and do the update step at the end. | ||
| 18 | |||
| |
14.1 | 19 | [[image:1657110612649-187.png]] |
| 20 | |||
| 21 | |||
| |
16.2 | 22 | [[image:1657110765365-816.png]] |
| |
14.1 | 23 | |
| |
16.2 | 24 | [[image:1657110803212-629.png]] |
| 25 | |||
| 26 | |||
| 27 | |||
| |
3.1 | 28 | * Show Whole Project = true |
| |
1.1 | 29 | |
| |
2.1 | 30 | = Setup = |
| |
1.1 | 31 | |
| |
6.1 | 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 | |||
| |
2.1 | 53 | == Cloning a repository == |
| |
1.1 | 54 | |
| |
2.1 | 55 | == Creating a branch == |
| |
1.1 | 56 | |
| |
2.1 | 57 | == Switching branches == |
| |
1.1 | 58 | |
| |
2.1 | 59 | == Merge Conflicts == |
| 60 | |||
| |
1.1 | 61 |