Changes for page git-for-windows

Last modified by Gideon Lombard on 2023/09/18 11:37

<
From version < 4.1 >
edited by Rudi Marais
on 2022/07/06 12:39
To version < 31.1 >
edited by Gideon Lombard
on 2023/09/15 09:25
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Parent
... ... @@ -1,1 +1,1 @@
1 -Technical Documentation.Source Control.WebHome
1 +technical-documentation.Source Control.WebHome
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.rudim
1 +XWiki.gideonl
Content
... ... @@ -1,18 +1,89 @@
1 -
1 +Hi Team
2 2  
3 +**Pre-requisites**
4 +
5 +~1. Install [[WinMerge>>https://winmerge.org/]]
6 +
7 +2. Install [[Notepad++>>https://notepad-plus-plus.org/]]
8 +
9 +3. Install [[VisualStudio Code>>https://code.visualstudio.com/Download]]
10 +
3 3  When you open the projects from the new locations you might have to fix some of the references due to the folder structures changing ie code is not under a "Development" folder as it now is branch based. This can be done by editing the csproj directly or doing a search and replace with the new paths where applicable, alternatively you can remove the old references via IDE and relink to new paths **do not link to old paths on your machine**​.
4 4  
5 5  
6 6  Some of the projects have been converted to start using our own nuget feed so to ensure you do not have any connectivity issues:
7 7  
16 +~1. Make sure that you download and install the latest version of Git from [[https:~~/~~/gitforwindows.org/>>https://gitforwindows.org/]]
17 +
18 +
19 +[[image:1657114851784-392.png]]
20 +
21 +
22 +Leave all settings as per default on this screen.
23 +
24 +[[image:1657114877100-308.png]]
25 +
26 +
27 +[[image:1657114930282-807.png]]
28 +
29 +
30 +[[image:1657114946064-403.png]]
31 +
32 +
33 +
34 +[[image:1657114967427-838.png]]
35 +
36 +[[image:1657114979552-688.png]]
37 +
38 +
39 +[[image:1657114991695-101.png]]
40 +
41 +
42 +[[image:1657115030668-697.png]]
43 +
44 +[[image:1657115041449-256.png]]
45 +
46 +
47 +[[image:1657115057201-480.png]]
48 +
49 +
50 +[[image:1657115066593-304.png]]
51 +
52 +
53 +[[image:1657115075687-171.png]]
54 +
55 +
56 +[[image:1657115106191-233.png]]
57 +
58 +
59 +
60 +
61 +
8 8  1. make sure your VS is updated with the latest updates (critical)
9 9  1. (((
10 -install [[The Azure Artifacts Credential Provider>>url:https://github.com/Microsoft/artifacts-credprovider#setup]]
64 +install [[The Azure Artifacts Credential Provider>>url:https://github.com/Microsoft/artifacts-credprovider#setup]] and select the **PowerShell helper script **link
65 +
66 +[[image:1657111373296-938.png]]
67 +
68 +Click the copy icons to copy the text
69 +
70 +[[image:1657111476063-780.png]]
71 +
72 +
73 +Open Windows Powershell ISE as administrator and click the new button and paste the text in the script window
74 +
75 +[[image:1657111556824-350.png]]
76 +
77 +
78 +[[image:1657111596157-325.png]]
79 +
80 +Click the Run button to execute the script
81 +
82 +
11 11  )))
12 12  1. (((
13 -run:
85 +For the Visual Studio development users they require to run the following inside a Visual Studio Command Shell as an administrator
14 14  
15 -
16 16  dotnet nuget add source https:~/~/pkgs.dev.azure.com/ebsphere/ebsphere/_packaging/ebs-dev/nuget/v3/index.json ~-~-name ebs-dev
17 17  )))
18 18  
... ... @@ -25,7 +25,18 @@
25 25  >mklink /D c:\dev\src\Packages C:\dev\Packages
26 26  
27 27  
99 +[[image:1657115475686-934.png]]
28 28  
101 +
102 +The URL's for different repositories to clone is as follows:
103 +
104 + ~-~-> Application Source Code
105 +
106 +[[image:1657115603808-846.png]]
107 +
108 +
109 +[[image:1657115842929-756.png]]
110 +
29 29  For reference attached is the mappings of the new folders from old folders.
30 30  
31 31  
... ... @@ -35,9 +35,8 @@
35 35  1. (((
36 36  Right click the migration folder and create a new branch via the TortoiseGit menu
37 37  
38
39 39  
40 -1. [[image:image-20220706143920-1.png]]
121 +1. [[image:image-20220706143954-1.png]]
41 41  )))
42 42  1. specify branch name follow this pattern for now (names cannot have spaces use dashes -):
43 43  
... ... @@ -51,11 +51,8 @@
51 51  11. if it has no work item associated to it
52 52  
53 53  1. make sure you select branch = master and switch to new branch is checked
54 -
55 -11.
135 +11. [[image:image-20220706143954-2.png]]
56 56  
57 -
58 -
59 59  As mentioned Friday if there is a piece of new code that has sync over yet and you need it, merge it over on your end with something like winmerge //once you have created a feature branch//.
60 60  
61 61  
... ... @@ -62,4 +62,4 @@
62 62  As always please reach out if you get stuck.
63 63  
64 64  
65 -
143 +Regards
1657111373296-938.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +226.1 KB
Content
1657111464373-125.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +7.6 KB
Content
1657111476063-780.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +7.6 KB
Content
1657111556824-350.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +23.7 KB
Content
1657111596157-325.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +66.2 KB
Content
1657111999409-160.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +93.1 KB
Content
1657112070557-484.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +111.9 KB
Content
1657114851784-392.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +32.1 KB
Content
1657114877100-308.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +45.2 KB
Content
1657114930282-807.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +34.8 KB
Content
1657114946064-403.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +44.5 KB
Content
1657114967427-838.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +51.4 KB
Content
1657114979552-688.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +34.8 KB
Content
1657114991695-101.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +38.3 KB
Content
1657115030668-697.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +50.5 KB
Content
1657115041449-256.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +51.4 KB
Content
1657115057201-480.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +39.9 KB
Content
1657115066593-304.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +39.9 KB
Content
1657115075687-171.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +37.6 KB
Content
1657115106191-233.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +38.9 KB
Content
1657115475686-934.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +17.0 KB
Content
1657115603808-846.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +47.5 KB
Content
1657115842929-756.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.gideonl
Size
... ... @@ -1,0 +1,1 @@
1 +42.4 KB
Content
image-20220706143954-1.png
Author
... ... @@ -1,0 +1,1 @@
1 +XWiki.rudim
Size
... ... @@ -1,0 +1,1 @@
1 +72.6 KB
Content

Need help?

If you need help with XWiki you can contact: