Hey Everyone, I have seen people forking the wrong repository, please make sure that you fork the original repository which is :- github.com/rahulmalhotra/salesforce-git-codelab and make a PR there itself. Please do not fork any other repo which is already forked from this one, as I won't be able to merge your changes if you make a PR to the wrong repository. Thank you for following the tutorial :-)
This was nice and elaborated nicely. Can you please guide on this one ? 1. SB1 -> SB2 with git hub actions 2. SB1 -> MasterThis message didn't send. Click to try again. 3. SB2-> Branch1 4. Then we can commit to SB2 org in Feature branch and then will create PR & once merged to master. 5. Then push to SB1 org via git hub actions with the YML file guidance as well So without scratch org can this be achievable ? It will be highly useful I think for many people and Thanks once again :) (y)
Hi, Happy to know that you liked it :-) , make sure to share it in your network as well..!! I think, I have shared you the sample yml files over the DM on facebook.
Hi Venkat, so happy to know that you liked it buddy :-) Do share it among others as well...!! Hope to see your name in the contributors list too. Yes, GitHub Actions is also in the plan, will create a video on that in future.
Hi Rahul, First of all thanks for the video., really helpful. I have few questions. So I have a small startup where i want to implement this Github development and deployment. Questions: 1. Can i create repository for production metadata ? 2. Lets if i create a repository from sandbox metadata, cloned that into vs code and created scratch org and did changes into branch and pushed to repository. again merge those changes to sandbox repo and deployed to Sandbox org. after that how can i deploy thise changes to prod through github ?
Hi Amol, ideally you should have only one repository and you can have different branches to store data linked to different environments like: sandbox/production
Hi Rahul.. Thank you for the wonderful video 🙂 It is very useful... Just a quick question.. Once you merge the pull request, the code from git directly gets deployed in the DEV org and we are able to view the vf page output... So how is this configured?.. In VS code i can use the same git repo to take code back up from multiple orgs. Please clarify..
Hi Gayathri, Glad you liked the tutorial :) will look forward to your updated PR so that I can merge it. I am using GitHub actions and wrote a simple script for deployment. You can check that here: github.com/rahulmalhotra/salesforce-git-codelab/blob/master/.github/workflows/main.yml
Hi Rahul.. Very nice explanation of git concepts and integration with SFDX.. I wanted to know how did you create that public page in your main org.? Would love to know What did you use to creat that public page.. Keep up the great work..!!
Thank you buddy. Happy to know that you liked the codelab :-) I created a public Salesforce site and added a lightning component to it to display the names of contributors.
SFDC Stop thanks Rahul.. Can you create a tutorial for SF Sites or Community.?? This is a very hard to find topic anywhere on TH-cam or Udemy.. I am sure a lot of people would appreciate that..
Hello Rahul! How does it identify that it is a merge conflict? Can't it be like the one you created as a third contributor and the other person who created a third contributor shows as a fourth contributor on the master branch?
Hi Ravi, if 2 developers have updated the same line numbers (same code), then git mark it as a merge conflict. Sometimes, it's possible that the git automatically resolve the merge conflict, but I won't recommend that because that may result in issues. For ex:- let's say one developer deleted a method in the apex class whereas in the branch of another dev, that method is present, when you merge the two, the auto merge will actually put that method back again and again which is not good.
i pushed a branch from vscode and it got failed after my push and when it got validating. i fixed those errors in my org,now i want to add the new class changes and repush the branch,how can i do it?
we are using Vscode and Bitbucket i installled git and vscode and cloned into local, all i see is master branch in bottom left corner but i wanted to connect to my teammate branch and make changes and then commit but i was unable to connect to that branch instead its sitting as master does anyone know how?
@@sfdcstop got it thanks,i wanted to remove a class or component from my feature branch and push it,but i dont see any way to go to what my deployement list in vscode,where to check the list of items i am deploying from vscode
Hey Everyone, I have seen people forking the wrong repository, please make sure that you fork the original repository which is :- github.com/rahulmalhotra/salesforce-git-codelab and make a PR there itself. Please do not fork any other repo which is already forked from this one, as I won't be able to merge your changes if you make a PR to the wrong repository. Thank you for following the tutorial :-)
This was nice and elaborated nicely.
Can you please guide on this one ?
1. SB1 -> SB2 with git hub actions
2. SB1 -> MasterThis message didn't send. Click to try again.
3. SB2-> Branch1
4. Then we can commit to SB2 org in Feature branch and then will create PR & once merged to master.
5. Then push to SB1 org via git hub actions with the YML file guidance as well
So without scratch org can this be achievable ?
It will be highly useful I think for many people and Thanks once again :) (y)
Hi, Happy to know that you liked it :-) , make sure to share it in your network as well..!!
I think, I have shared you the sample yml files over the DM on facebook.
Thanks for amazing learning
Happy to knnow that you liked it Sonia :-) Make sure to share it among others too...!!
Great Session 👌 really helpful who ever newly working with git .could you create video on github workflow Actions and sfdx auto deployments.
Hi Venkat, so happy to know that you liked it buddy :-) Do share it among others as well...!! Hope to see your name in the contributors list too. Yes, GitHub Actions is also in the plan, will create a video on that in future.
Hi Rahul,
First of all thanks for the video., really helpful.
I have few questions. So I have a small startup where i want to implement this Github development and deployment.
Questions:
1. Can i create repository for production metadata ?
2. Lets if i create a repository from sandbox metadata, cloned that into vs code and created scratch org and did changes into branch and pushed to repository. again merge those changes to sandbox repo and deployed to Sandbox org. after that how can i deploy thise changes to prod through github ?
Hi Amol, ideally you should have only one repository and you can have different branches to store data linked to different environments like: sandbox/production
Amazing session! Learnt a lot 🙏
Glad you liked it buddy...!! Hope to see your name onto the contributors list as well 😊
Hi Rahul.. Thank you for the wonderful video 🙂 It is very useful... Just a quick question.. Once you merge the pull request, the code from git directly gets deployed in the DEV org and we are able to view the vf page output... So how is this configured?.. In VS code i can use the same git repo to take code back up from multiple orgs. Please clarify..
Hi Gayathri, Glad you liked the tutorial :) will look forward to your updated PR so that I can merge it.
I am using GitHub actions and wrote a simple script for deployment. You can check that here: github.com/rahulmalhotra/salesforce-git-codelab/blob/master/.github/workflows/main.yml
Hi Rahul.. Very nice explanation of git concepts and integration with SFDX.. I wanted to know how did you create that public page in your main org.? Would love to know What did you use to creat that public page.. Keep up the great work..!!
Thank you buddy. Happy to know that you liked the codelab :-) I created a public Salesforce site and added a lightning component to it to display the names of contributors.
SFDC Stop thanks Rahul.. Can you create a tutorial for SF Sites or Community.?? This is a very hard to find topic anywhere on TH-cam or Udemy.. I am sure a lot of people would appreciate that..
Noted. Thank You for the suggestion
Amazing rahul
Hello Rahul!
How does it identify that it is a merge conflict? Can't it be like the one you created as a third contributor and the other person who created a third contributor shows as a fourth contributor on the master branch?
Hi Ravi, if 2 developers have updated the same line numbers (same code), then git mark it as a merge conflict. Sometimes, it's possible that the git automatically resolve the merge conflict, but I won't recommend that because that may result in issues. For ex:- let's say one developer deleted a method in the apex class whereas in the branch of another dev, that method is present, when you merge the two, the auto merge will actually put that method back again and again which is not good.
@@sfdcstop Thanks a lot! 👍👍
subscribed ❤️❤️❤️
i pushed a branch from vscode and it got failed after my push and when it got validating.
i fixed those errors in my org,now i want to add the new class changes and repush the branch,how can i do it?
You need to pull the changes from your org using sfdx commands and push it to your repo by using git commands.
we are using Vscode and Bitbucket
i installled git and vscode and cloned into local, all i see is master branch in bottom left corner but i wanted to connect to my teammate branch and make changes and then commit
but i was unable to connect to that branch instead its sitting as master
does anyone know how?
Hey Porter, looks like you haven't fetched all branches. Can you try "git fetch --all" command once and see if you can then see the branches?
@@sfdcstop got it thanks,i wanted to remove a class or component from my feature branch and push it,but i dont see any way to go to what my deployement list in vscode,where to check the list of items i am deploying from vscode
The deployment information is in package.xml, if you've connected your project to a sandbox or developer org.
i want to remove a class from a branch i committed from vscode,does anyone knows how to remove that?
Remove the .cls file and the related .cls-meta.xml file of the class you want to remove and deploy to org