#Git0 debatiendo

Adopt Git-Based Salesforce Development in 8 Steps

Discover how to transition from org-based to source-based development in Salesforce. Follow a comprehensive Git playbook that outlines eight simple steps and learn the key benefits of this approach.

Date: Wednesday, September 18

Time: 2:45 PM - 3:30 PM PDT

Location: Moscone West, Level 3, Room 3018 

Bookmark (no reservation needed): https://reg.salesforce.com/flow/plus/df24/sessioncatalog/page/catalog/session/1718915794336001QCWW

Moscone West, L3, Room 3018

#Salesforcedevops #Git #Source-Driven Development #Version Control Systems 

Hey everyone,

I am curious if anyone has suggestions for managing different branches and sandboxes within version control. We have 3 main sandboxes and our production org setup with their own branch:

master -> prod

training -> UAT

QA -> QA

develop -> develop

Right now, we struggle with environment specific values such as workflows email alerts with org-wide sender addresses, and custom labels. Maintaining different values across branches makes merges an absolute nightmare. We are selectively checking out individual files or cherry picking commits to move changes across branches/ orgs right now, but it feels like that is not the correct strategy.

I am also curious how folks manage individual files that touch multiple parts of the application, such as permission sets and trigger handlers. Oftentimes, there may be new functionality in a QA branch or sandbox, and only a portion of it is supposed to go to production for a release.

I know we are probably doing something incorrectly, but it seems like normal git branching and merging strategies are fundamentally at odds with the way that Salesforce sandboxes and orgs work.

Looking forward to hear from everyone's experiences and expertise - thank you!

How to combine both MDAPI and SFDX way of working?

Currently we are looking into adopting SFDX on our enterprise org.

A brief overview of our setup/current status:

• "Monolith" org
• Everything is under version control (GIT) - MDAPI format
• Working pipelines for all higher test environments (full copies) & production

Since we are way above the limit of 10K components & have an existing operational projects running in parallel, we cannot start with migrating everything in a big bang to SFDX.

In order to do this, we were thinking of starting small, with a specific team on SFDX and all other teams still utilizing regular sandboxes. The following approach seemed feasible to us:

1. Convert the MDAPI repository to Source and create a project specific branch out of it
2. Create a feature branch for the developer to work on (push specific code to scratch org and pull back if needed)
3. Once finished, merge feature branch into project branch (still all Source format)
4. Convert Source to MDAPI and merge with full org MDAPI code base

The structure of the branches would be the following (see attachment)

This now brings me to the core question, what is the best way to handle step 4? I was thinking to do the following:

--> Create regular sandbox, merge code to this sandbox and retrieve full MDAPI code?

What do you guys think & most important, how can this be automated?