Skip to content

Commit 17b8ad6

Browse files
committed
fix: explain CI/CD specificities (#160)
1 parent d5e9695 commit 17b8ad6

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ You can check if the merge driver is enabled by running the following command:
174174
grep "merge=salesforce-source" .git/info/attributes
175175
```
176176

177+
## Specificities in CI/CD context
178+
179+
The plugin will add content in the file `$GIT_DIR/info/attributes` to enable the merge driver.
180+
This files need to be present for the plugin to be installed.
181+
Ensure the repository is properly cloned / checked out in CI/CD context before installing the plugin.
182+
177183
## Behavior when the merge driver does not know the key
178184

179185
If the merge driver encounters a list of elements (like fields in a profile, or permissions in a permission set) but does not know which field acts as the "key" (unique identifier) for that type, it will fallback to standard conflict behavior.

0 commit comments

Comments
 (0)