Content Comparison

1. Checkout to the source branch. Make sure to take note of your changes that must be merged and deployed.

2. Run the Git fetch command.

3. From the Terminal, run the Git checkout command to copy the contents of a file from the target branch:

   Code Block
   git checkout <target_branch> -- <file_path> git checkout origin/master -- 'force-app\main\default\classes\SampleClass.cls'

4. The file will now be the same as what is in the target branch, and your changes will be overwritten. Commit and push the staged changes.

5. Create a pull request, merging the source branch to the target branch. This pull request should not contain your actual changes, and will only contain changes found in the target branch but not in the source branch.

6. With the file still open, manually add your changes. Commit and push to the remote branch.

7. Create a second pull request, merging the source branch to the target branch. This pull request will contain your actual changes, but with no more merge conflicts.

1. Create a new, temporary branch based from the branch you want to revert a merge commit from, e.g., TAP-1250-RevertFromMaster based from origin/master

2. Get the Commit ID of the merge commit you will revert, e.g., 294229cf

Image Added

3. Make sure you are checked out to the temporary branch. From Terminal, type command:

git revert <commit id> -m 1
git revert 294229cf -m 1

4. Commit the changes in the temporary branch, and then publish branch

5. From the temporary branch, create a pull request to the target branch, e.g., TAP-1250-RevertFromMaster to origin/master

6. Once pipelines are successful and PR is approved, merge to target branch

1. This process is done after PROD deployments to sync sit and uat branches with master, and uses a “no-commit” branch that is based from master. Use the branch: ALL-noCommitFromMaster.

2. Make sure to rebase the no-commit branch by running a Git pull command:

git pull origin master

3. Push the commits.

4. Create a pull request for merging ALL-noCommitFromMaster to sit, and another pull request to merge the same branch to uat.

// validate multiple files using package.xml
sfdx force:source:deploy -c -x manifest/package.xml -l NoTestRun

// validate a single file
sfdx force:source:deploy -c -p 'force-app\main\default\classes\SampleClass.cls' -l NoTestRun

// retrieve multiple files using package.xml
sfdx force:source:retrieve -x manifest/package.xml

// retrieve a single file
sfdx force:source:retrieve -p 'force-app\main\default\classes\SampleClass.cls'