sf-git-merge-driver 1.2.1-dev-137.18569268997-1 → 1.2.1-dev-137.18912604948-1

package/README.md

@@ -105,6 +105,37 @@ Configured for these metadata files by default:
 *.objectTranslation-meta.xml merge=salesforce-source
 ```
 
+## How to disable it for a specific merge
+
+When you don't want to use the merge driver for a specific merge, just backup the `.git/info/attributes` file and put it back after the merge.
+```sh
+mv .git/info/attributes .git/info/attributes.bak
+git merge <branche>
+mv .git/info/attributes.bak .git/info/attributes
+```
+
+If you want to disable the merge driver for a specific file, just comment the merge driver configuration from the `.git/info/attributes` file.
+```sh
+# *.profile-meta.xml merge=salesforce-source
+```
+
+If you want to disable it for all the project, just uninstall the driver: 
+```sh
+sf git merge driver uninstall
+```
+
+## How to know if it is installed and enabled ?
+
+You can check if the merge driver is installed by running the following command:
+```sh
+git config --show-origin --get-regexp '^merge.salesforce-source(\..*)?'
+```
+
+You can check if the merge driver is enabled by running the following command:
+```sh
+grep "merge=salesforce-source" .git/info/attributes
+```
+
 ## Troubleshooting
 
 The plugin uses the [Salesforce CLI logging system](https://developer.salesforce.com/docs/atlas.en-us.sfdx_setup.meta/sfdx_setup/sfdx_dev_cli_log_messages.htm) to log information.
@@ -157,7 +188,7 @@ EXAMPLES
     $ sf git merge driver install
 ```
 
-_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18569268997-1/src/commands/git/merge/driver/install.ts)_
+_See code: [src/commands/git/merge/driver/install.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912604948-1/src/commands/git/merge/driver/install.ts)_
 
 ## `sf git merge driver run`
 
@@ -201,7 +232,7 @@ EXAMPLES
   - output-file is the path to the file where the merged content will be written
 ```
 
-_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18569268997-1/src/commands/git/merge/driver/run.ts)_
+_See code: [src/commands/git/merge/driver/run.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912604948-1/src/commands/git/merge/driver/run.ts)_
 
 ## `sf git merge driver uninstall`
 
@@ -228,7 +259,7 @@ EXAMPLES
     $ sf git merge driver uninstall
 ```
 
-_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18569268997-1/src/commands/git/merge/driver/uninstall.ts)_
+_See code: [src/commands/git/merge/driver/uninstall.ts](https://github.com/scolladon/sf-git-merge-driver/blob/v1.2.1-dev-137.18912604948-1/src/commands/git/merge/driver/uninstall.ts)_
 <!-- commandsstop -->
 ## Changelog
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sf-git-merge-driver",
-  "version": "1.2.1-dev-137.18569268997-1",
+  "version": "1.2.1-dev-137.18912604948-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sf-git-merge-driver",
-      "version": "1.2.1-dev-137.18569268997-1",
+      "version": "1.2.1-dev-137.18912604948-1",
       "license": "MIT",
       "dependencies": {
         "@oclif/core": "^4.5.6",

package/oclif.manifest.json

@@ -284,5 +284,5 @@
       ]
     }
   },
-  "version": "1.2.1-dev-137.18569268997-1"
+  "version": "1.2.1-dev-137.18912604948-1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sf-git-merge-driver",
   "description": "git remote add origin git@github.com:scolladon/sf-git-merge-driver.git",
-  "version": "1.2.1-dev-137.18569268997-1",
+  "version": "1.2.1-dev-137.18912604948-1",
   "exports": "./lib/driver/MergeDriver.js",
   "type": "module",
   "author": "Sébastien Colladon (colladonsebastien@gmail.com)",