GIT PR Creation - Git Access Issues & Fixes

Steps For PR (Pull Request) Creation  

Steps	Commands
Login to GitHub	If you are using Okta SSO,Login to Okta  and login to Git
Reset your name & Email Note : May not require always, But in case If you are working with specific client git access the commit should be with the client provided name and email	$ git config --global user.name "Deepika KM" $ git config --global user.email Deepika@xyz.com
Clone : The branch code which you would like to take as base Ex: Master Branch	1.Create a local folder where you would like to clone the code from Git 2.Open Command Prompt Change directory to that folder. Ex: CD C/TestProj 3.Enter the below git command to clone     git clone <Your branch> Ex: git clone https://github.com/testadmin/testsfdc.git
Issue Number : Create a new issue number for every requirement /defect which would like to track and upload the code to git.	1.Click on New Issue button provide title and description Ex: Title = <Release Name> <Story/Defect Number>  Desc = <Provide the link of that story /defect according to your project where you maintain> Ex: 3000 is the issue number get generates
Branch Creation : Best practice is to suffix the issue number, So that its easy to look up to the requirement for which this code is been created	1.After you clone the code to local folder can see a parent folder under which all the code would have downloaded.[Ex: aura, classes, components etc..] 2.Change the directory path to that folder before executing the git command 3.Command : git branch <Release Name –Story Number>#<Issue Number > Ex: git branch JanRelease-STY-01001#3000
Git Push vs Git Push Origin :Both used to push local changes to git repository Git Push: Where remote repository already defined and have single repository can use this command. Git Push Origin :If need to push to the specific repository this will be useful where we have multiple repositories.	git push git push origin JanRelease-STY-01001#3000
Get latest changes from git repository to local	git pull Used to get the latest code from repository to local
Checkout Branch	git checkout <Release Name –Story Number>#<Issue Number > Ex: git checkout JanRelease-STY-01001#3000
Verify the status: Which shows if any files got modified in local and not present in git repository	git status
Code Compare & Merge the latest changes to the files. Note : Please follow the best practice to add the comments for the code change w.r.t the story or defect.	For code compare, https://www.devart.com/codecompare/download.html#anchorDowload
Commit Code  & Push to specific repository	git commit -a -m “uploading changes w.r.t STY-01001,Issue #3000” git push --set-upstream origin JanRelease-STY-01001#3000 Note : on success you can see the commit details in the Git UI
New Files: Then 1st add all files and commit	git add –all git commit -a -m “uploading changes w.r.t STY-01001,Issue #3000” git push --set-upstream origin JanRelease-STY-01001#3000 Note : on success you can see the commit details in the Git UI
PR - Pull Request : Pull requests let you tell others about changes you've pushed to a GitHub repository. Once a pull request is sent, interested parties can review the set of changes, discuss potential modifications, and even push follow-up commits if necessary.	Create a PR request for this branch using the same issue number mentioned above. Ex:JanRelease-STY-01001#3000 Note : rebase to the specific branch SIT/UAT /Master w.r.t your project. Other Steps: Assign to yourself Select reviewers à Request Select label à Which Release

 Issues -Fixes :

1.fatal: unable to access 'https://github.com/': SSL certificate problem:

self signed certificate in certificate chain.

git config --global http.sslVerify false

2.https://github.com/orgs/xyz/sso?authorization_request=<AccessToken> 

Enter above link in browser and login ,Once you accept the above and give below

command it will clone

3.RPC failed; HTTP 503 curl 22 The requested URL returned error: 503

Verify any firewall,Disable the firewall to connect the client

4.fatal: not a git repository (or any of the parent directories): .git

Change the directory to sfdc of the cloned folder

5.How to know your git user and email ?
Commands :
git config --global --list
Individually can use below as well
git config user.name
git config user.email

6. fatal: --local can only be used inside a git repository ?
Change the directory to the project where you have ".github" folder.

7. How to config two different git repo with different credentials in one system?
Ex: 1 with company credentials & 2nd with personal credentials ?
git config --local  --list
git config --local user.name "xyz"
config --local user.email "xyz@gmail.com"

8. How to get one commit changes to other branch ?

Ex: You created a feature branch due to some issues you need to delete that branch and on the latest main branch code re commit your changes ,So instead of staging the changes in each file can use cherry pick git command to fetch that commit specific changes to your new feature branch.

git cherry-pick <Commit Id>