Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Expand
titleDownstream deployment process
  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:

Code Block
git pull origin master
  1. Push the commits.

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

...

Rebase Process

...

Recording:

...

https://unisyd-my.sharepoint.com/:v:/g/personal/bob_alicante_sydney_edu_au/EcZOj_7j9-BMk09Xg2u_D8IBoeJGiE_xYeLxvaKcNbdrLQ?e=V6bscc

...

Deleting branches

Expand
titleDeleting branches locally and remotely

Using VS Code

, navigate

  1. Navigate to Git Graph. Make sure to run fetch from remote(s).

  2. Right-click on a branch and select Delete Branch….

  1. If the branch needs to be deleted on the remote, tick both checkboxes. Otherwise, just click on Yes, delete.

Using the Terminal

  1. To delete a branch locally, run the following command:

Code Block
git branch -d <branch_name>
git branch -D <branch_name>
  • -d is a shortcut for --delete, and -D is a shortcut for --delete --force

  1. To delete a branch remotely, run the following command:

Code Block
git push <remote_branch> -d <branch_name>

...

Useful SFDX commands

Code Block
// 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'

...