Salesforce Git Codelab | Learn By Doing | Live Deployment | SFDC Stop | GitHub Actions
Hello Trailblazers, First of all a BIG THANK YOU to all of you, we recently crossed 2500 subscribers. Thank you all for following the tutorials :-)
So, here I welcome you to the first codelab from SFDC Stop. In this Codelab, we're going to cover a lot of git concepts which are given below:-
1. Fork a repository:- https://github.com/rahulmalhotra/sale...
Create my own copy of github repo
2. Clone a repository
git clone https://github.com/your-username/sale...
3. Create a branch
git checkout -b rahuldev
4. Commit Changes
git status
git add .
git commit -m "Commit Message"
5. Push to a repository
git push origin rahuldev
6. Create a Pull Request
You're done :-)
---- You have to follow me step by step till here ----
7. Merge a Pull Request and Live Deployment using GitHub Actions
8. Create a Merge Conflict
Because we're having same changes over same lines in a single file
9. Resolve Merge Conflict
Store the original repo URL
git remote add upstream https://github.com/rahulmalhotra/sale...
Switch to master branch
git checkout master
Pull from Original repository
git fetch upstream master
Merge upstream master with local master
git merge upstream/master
Merge master branch into rahuldev
git merge master --no-ff (no-ff means no fast forward)
Staged Changes
git add .
Made a commit
git commit -m "Commit Message"
PR is updated automatically
10. Contributing towards open-source | SFDX Deploy Tool Mac Support
Have a look at the GitHub Repository:- https://github.com/rahulmalhotra/sale...
Link to Salesforce Site to View "SFDC Stop Contributors":- https://rahulm-developer-edition.ap5....
Subscribe to SFDC Stop:- https://www.youtube.com/c/sfdcstop?su...
Interested in learning about Scratch Orgs and SFDX ? Have a look at the playlist:- • Getting started with Scratch Orgs and...
Interested in learning about Integration ? Have a look at this playlist:- • Salesforce Integration Tutorial Series
