DevOps Quick Bites - Working With Git Version Control Pt. 2

Share with

LinkedIn
Twitter

In this episode, Rob Cowell continues his introduction to Git with Salesforce. He covers Git branching, merging and merge conflicts in Salesforce and Visual Studio code — and how to manage them effectively.

Learn more:

- Choosing the right Git branching strategy for your Salesforce team: https://grst.co/3TiL2XA

- How to avoid and resolve merge conflicts in your Salesforce CI/CD pipeline: https://grst.co/3zbL5NV

- Version control for Salesforce: https://grst.co/3Zbe0Mv

Connect with Rob:

LinkedIn: https://www.linkedin.com/in/rob-cowell/

X/Twitter: https://x.com/RobSalesforce

Subscribe to Gearset's YouTube channel: https://grst.co/3uDoSGe

LinkedIn: https://www.linkedin.com/company/gearset

X/Twitter: https://twitter.com/GearsetHQ

Facebook: https://www.facebook.com/gearsethq

About Gearset: Gearset is the leading Salesforce DevOps platform, with powerful solutions for metadata and CPQ deployments, CI/CD, automated testing, sandbox seeding and backups. It helps Salesforce teams apply DevOps best practices to their development and release process, so they can rapidly and securely deliver higher-quality projects. Get full access to all of Gearset's features for free with a 30-day trial: https://grst.co/3AUhvgk

Chapters:

00:00 Introduction

00:39 Git branching

01:25 Branching and merging example

02:07 Merge conflicts and resolving them

03:11 Summary and conclusion