Object Rules
Package.xml
Feature Branch
git checkout -b
sfdx force:source:retrieve -x manifest/package.xml
git add */.*
git commit -m ""
git push origin
Promotional INT
git checkout -b _promotional_INT
git merge origin/int
sfdx force:source:retrieve -x manifest/package.xml
git add */.*
git commit -m "Resolve Merge Conflicts: -> INT"
git push origin _promotional_INT
Promotional QA
git checkout -b _promotional_QA
git merge origin/qa
sfdx force:source:retrieve -x manifest/package.xml
git add */.*
git commit -m "Resolve Merge Conflicts: -> QA"
git push origin _promotional_QA