Update schema text and merge conditionals

borgmatic/commands/borgmatic.py

@@ -65,8 +65,7 @@ def run_configuration(config_filename, config, arguments):
                 '{}: Failed to acquire lock'.format(config_filename), error
             )
 
-    if not encountered_error:
-        if 'create' in arguments:
+    if not encountered_error and 'create' in arguments:
         try:
             dispatch.call_hooks(
                 'ping_monitor',

borgmatic/config/schema.yaml

@@ -34,7 +34,7 @@ map:
                 example: true
             lock_client:
                 type: bool
-                desc: Lock config when running borgmatic to prevent multiple instances from running simultaneously
+                desc: Lock config when running borgmatic to prevent multiple instances from running simultaneously. Defaults to false.
                 example: true
             numeric_owner:
                 type: bool