Changes for page git-for-windows

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

<
From version < 32.1 >
edited by Gideon Lombard
on 2023/09/15 09:29
To version < 35.1 >
edited by Gideon Lombard
on 2023/09/15 09:35
>
Change comment: There is no comment for this version

Summary

Details

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

Need help?

If you need help with XWiki you can contact: