fixup! fixup! Rewrite RTD configuration to use build.jobs rather than build.commands

Author: zware

.readthedocs.yml

@@ -20,11 +20,12 @@ build:
       # directory or RTD configuration, or if we can't cleanly merge the base
       # branch.
       - |
+        set -e;
         if [ "$READTHEDOCS_VERSION_TYPE" = "external" ];
         then
           base_branch=main;
           git fetch --depth=1 origin $base_branch;
-          if !git merge --no-edit origin/$base_branch;
+          if ! git merge --no-edit origin/$base_branch;
           then
             echo "Unsuccessful merge with '$base_branch' branch, skipping the build";
             exit 183;