Changes for page git-for-windows

Last modified by Gideon Lombard on 2023/09/18 11:37
<
From version < 35.1 >
edited by Gideon Lombard
on 2023/09/15 09:35
To version < 33.1 >
edited by Gideon Lombard
on 2023/09/15 09:30
>
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -git-for-windows
1 +getting-started
Parent
... ... @@ -1,1 +1,1 @@
1 -technical-documentation.Source Control.client-tools.WebHome
1 +technical-documentation.Source Control.WebHome
Content
... ... @@ -1,41 +1,107 @@
1 -~1. Make sure that you download and install the latest version of Git from [[https:~~/~~/gitforwindows.org/>>https://gitforwindows.org/]]
1 +Hi Team
2 2  
3 +**Pre-requisites**
3 3  
4 -[[image:1657114851784-392.png]]
5 +~1. Install [[WinMerge>>https://winmerge.org/]]
5 5  
7 +2. Install [[Notepad++>>https://notepad-plus-plus.org/]]
6 6  
7 -Keep all the options as per the default.
9 +3. Install [[VisualStudio Code>>https://code.visualstudio.com/Download]]
8 8  
9 -[[image:1657114877100-308.png]]
11 +4. Install [[Visual Studio 2022>>https://visualstudio.microsoft.com/vs/]]
10 10  
13 +**Software Installation**
11 11  
12 -[[image:1657114930282-807.png]]
15 +~1. Install [[Git for Windows>>doc:technical-documentation.Source Control.client-tools.git-for-windows.WebHome]]
13 13  
17 +2. Install [[tortoisegit>>doc:technical-documentation.Source Control.client-tools.tortoisegit.WebHome]]
14 14  
15 -[[image:1657114946064-403.png]]
19 +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**​.
16 16  
17 17  
22 +Some of the projects have been converted to start using our own nuget feed so to ensure you do not have any connectivity issues:1.
18 18  
19 -[[image:1657114967427-838.png]]
20 20  
21 -[[image:1657114979552-688.png]]
22 22  
26 +1. make sure your VS is updated with the latest updates (critical)
27 +1. (((
28 +install [[The Azure Artifacts Credential Provider>>url:https://github.com/Microsoft/artifacts-credprovider#setup]] and select the **PowerShell helper script **link
23 23  
24 -[[image:1657114991695-101.png]]
30 +[[image:1657111373296-938.png]]
25 25  
32 +Click the copy icons to copy the text
26 26  
27 -[[image:1657115030668-697.png]]
34 +[[image:1657111476063-780.png]]
28 28  
29 -[[image:1657115041449-256.png]]
30 30  
37 +Open Windows Powershell ISE as administrator and click the new button and paste the text in the script window
31 31  
32 -[[image:1657115057201-480.png]]
39 +[[image:1657111556824-350.png]]
33 33  
34 34  
35 -[[image:1657115066593-304.png]]
42 +[[image:1657111596157-325.png]]
36 36  
44 +Click the Run button to execute the script
37 37  
38 -[[image:1657115075687-171.png]]
46 +
47 +)))
48 +1. (((
49 +For the Visual Studio development users they require to run the following inside a Visual Studio Command Shell as an administrator
39 39  
51 +dotnet nuget add source https:~/~/pkgs.dev.azure.com/ebsphere/ebsphere/_packaging/ebs-dev/nuget/v3/index.json ~-~-name ebs-dev
52 +)))
40 40  
41 -[[image:1657115106191-233.png]]
54 +1.
55 +
56 +1.
57 +
58 +Also while we in the transition phase it might be helpful to add this link via this command:
59 +
60 +>mklink /D c:\dev\src\Packages C:\dev\Packages
61 +
62 +
63 +[[image:1657115475686-934.png]]
64 +
65 +
66 +The URL's for different repositories to clone is as follows:
67 +
68 + ~-~-> Application Source Code
69 +
70 +[[image:1657115603808-846.png]]
71 +
72 +
73 +[[image:1657115842929-756.png]]
74 +
75 +For reference attached is the mappings of the new folders from old folders.
76 +
77 +
78 +If you want to start making changes follow the following process:
79 +
80 +
81 +1. (((
82 +Right click the migration folder and create a new branch via the TortoiseGit menu
83 +
84 +
85 +1. [[image:image-20220706143954-1.png]]
86 +)))
87 +1. specify branch name follow this pattern for now (names cannot have spaces use dashes -):
88 +
89 +1. feature/il-12345
90 +11. if it is issue log related you can add a -short-description if needed
91 +11. 12345 = replace with issue log number
92 +1. feature/12345
93 +11. if it is azure task related
94 +11. 12345 = replace with az workitem number
95 +1. feature/short-description
96 +11. if it has no work item associated to it
97 +
98 +1. make sure you select branch = master and switch to new branch is checked
99 +11. [[image:image-20220706143954-2.png]]
100 +
101 +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//.
102 +
103 +
104 +As always please reach out if you get stuck.
105 +
106 +
107 +Regards

Applications

Navigation

Need help?

If you need help with XWiki you can contact: