merge main

pcottle · Nov 21, 2023 · d74bcdb · d74bcdb
2 parents e3bc532 + 3dfcc2b
commit d74bcdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/gulpfile.js b/gulpfile.js
@@ -227,6 +227,7 @@ var watching = function() {
     '__tests__/git.spec.js',
     'src/js/**/*.js',
     'src/js/**/**/*.js',
+    'src/js/**/*.jsx',
     'src/levels/**/*.js'
   ], series([fastBuild , jasmine, jshint, lintStrings]));
 };

diff --git a/src/levels/rampup/relativeRefs2.js b/src/levels/rampup/relativeRefs2.js
@@ -83,7 +83,9 @@ exports.level = {
               "",
               "`git branch -f main HEAD~3`",
               "",
-              "moves (by force) the main branch to three parents behind HEAD."
+              "moves (by force) the main branch to three parents behind HEAD.",
+              "",
+              "*Note: In a real git environment `git branch -f command` is not allowed for your current branch.*"
             ]
           }
         },