Copado Chapter 4 Exam Questions
With 100% Correct Answers.
Destructive Changes: Base Branch
Decides where the feature branch is created from
Destructive Changes: Credentials Lookup
Field displayed after destructive changes is selected. If a different credential is selected in
the lookup field, the metadata grid will display metadata indexed from the selected credential
Destructive Changes: Add Row Button
Used to find metadata that has already been deleted. User inputs API name and metadata type
Git Conflict (Merge Conflict)
When merging two branches that have the same files, but one or more lines in the files have been
updated with different values in each branch. Git requires your help to determine which changes
should be incorporated into the final merge.
Copado Merge Order
merge order of the User Stories into the Promotion branch is based on the User Story name
field in ascending order. From Copado V12, you can override the default name order and define
a custom merge order, based on a different user story field with asc or desc order.
Two Types of Conflict Resolution Processes
Automatic and Manual
Automatic Conflict Resolution To save you the manual work of resolving the conflicted files,
Copado provides you with the Auto Resolve feature. Depending on the type of file, Copado
will apply a different auto-resolve conflict strategy.
,Manual Conflict Resolution Copado allows you to manually resolve file conflicts during the
User Story promotion process with the Online Conflict Resolution feature.
Components to Exclude from Auto Resolve
ApexClass, ApexComponent, ApexPage, ApexTrigger and Layout
Copado Auto-Resolve Default Behavior
Copado will always attempt first to perform a Git merge, this means to integrate the content of
the source branch into the destination branch. If conflicts are detected, Copado will take
different approaches depending on the type of file.
Copado Auto Resolve: Semantic Merge Copado detects differences in branch files so
creates a third version of the file to bridge the gap between the other files
Copado detects differences in branch files so creates a third version of the file to bridge the
gap between the other files
Copado Auto Resolve: XML based Copado will do a semantic merge of the XML nodes if a
conflict is found for the following metadata types.
Profile
PermissionSet
WorkFlow
CustomObject
CustomLabels
AssignmentRules
Translations
CustomObjectTranslation
Copado Auto Resolve: StaticResources Whether the files are versioned or not within a Zip file,
the result in case of conflict will be different. Using the Unzip option in the Git Snapshot
, (recommended for JavaScript and CSS): Copado will create a new Zip file with the
merged content.
Copado Auto Resolve: All other files (e.g ApexClasses, ApexTriggers, Layouts)File
configuration in branch A will win over branch B. Meaning that the new changes override
the existing content.
Copado Auto Resolve: Review
You can compare the file differences and review the merge by checking the pull request
created by Copado.
1. Open the Promotion record and scroll down to the Deployments related list.
2. Click on Pull request.
You'll be redirected to your Git repository, where you will be able to compare the file differences
that caused the merge conflict.
Online Conflict Resolution (manual)
For specific and complex metadata types where identifying the right conflict resolution
strategy is not a straightforward activity, Copado allows users to manually resolve file conflicts
during the User Story promotion process, while User Story feature branches are merged into a
promotion branch. If the Online Conflict Resolution feature is active and the conflicted files
are of a supported type, Copado stops the merging process and uploads the conflicted files as
attachments to the Promotion record.
Enable the Online Conflict Resolution
multi select picklist field available on the Pipeline and Promotion records. If values listed
as exclude are different across related pipeline and promotion, the Promotion record will
take priority over pipeline
Conflict Detection Flow
1. The user story feature branch merge into the promotion branch is stopped.
2. A warning message will be displayed at the top alerting you that a merge conflict was found.
With 100% Correct Answers.
Destructive Changes: Base Branch
Decides where the feature branch is created from
Destructive Changes: Credentials Lookup
Field displayed after destructive changes is selected. If a different credential is selected in
the lookup field, the metadata grid will display metadata indexed from the selected credential
Destructive Changes: Add Row Button
Used to find metadata that has already been deleted. User inputs API name and metadata type
Git Conflict (Merge Conflict)
When merging two branches that have the same files, but one or more lines in the files have been
updated with different values in each branch. Git requires your help to determine which changes
should be incorporated into the final merge.
Copado Merge Order
merge order of the User Stories into the Promotion branch is based on the User Story name
field in ascending order. From Copado V12, you can override the default name order and define
a custom merge order, based on a different user story field with asc or desc order.
Two Types of Conflict Resolution Processes
Automatic and Manual
Automatic Conflict Resolution To save you the manual work of resolving the conflicted files,
Copado provides you with the Auto Resolve feature. Depending on the type of file, Copado
will apply a different auto-resolve conflict strategy.
,Manual Conflict Resolution Copado allows you to manually resolve file conflicts during the
User Story promotion process with the Online Conflict Resolution feature.
Components to Exclude from Auto Resolve
ApexClass, ApexComponent, ApexPage, ApexTrigger and Layout
Copado Auto-Resolve Default Behavior
Copado will always attempt first to perform a Git merge, this means to integrate the content of
the source branch into the destination branch. If conflicts are detected, Copado will take
different approaches depending on the type of file.
Copado Auto Resolve: Semantic Merge Copado detects differences in branch files so
creates a third version of the file to bridge the gap between the other files
Copado detects differences in branch files so creates a third version of the file to bridge the
gap between the other files
Copado Auto Resolve: XML based Copado will do a semantic merge of the XML nodes if a
conflict is found for the following metadata types.
Profile
PermissionSet
WorkFlow
CustomObject
CustomLabels
AssignmentRules
Translations
CustomObjectTranslation
Copado Auto Resolve: StaticResources Whether the files are versioned or not within a Zip file,
the result in case of conflict will be different. Using the Unzip option in the Git Snapshot
, (recommended for JavaScript and CSS): Copado will create a new Zip file with the
merged content.
Copado Auto Resolve: All other files (e.g ApexClasses, ApexTriggers, Layouts)File
configuration in branch A will win over branch B. Meaning that the new changes override
the existing content.
Copado Auto Resolve: Review
You can compare the file differences and review the merge by checking the pull request
created by Copado.
1. Open the Promotion record and scroll down to the Deployments related list.
2. Click on Pull request.
You'll be redirected to your Git repository, where you will be able to compare the file differences
that caused the merge conflict.
Online Conflict Resolution (manual)
For specific and complex metadata types where identifying the right conflict resolution
strategy is not a straightforward activity, Copado allows users to manually resolve file conflicts
during the User Story promotion process, while User Story feature branches are merged into a
promotion branch. If the Online Conflict Resolution feature is active and the conflicted files
are of a supported type, Copado stops the merging process and uploads the conflicted files as
attachments to the Promotion record.
Enable the Online Conflict Resolution
multi select picklist field available on the Pipeline and Promotion records. If values listed
as exclude are different across related pipeline and promotion, the Promotion record will
take priority over pipeline
Conflict Detection Flow
1. The user story feature branch merge into the promotion branch is stopped.
2. A warning message will be displayed at the top alerting you that a merge conflict was found.
