From efeee39973a73cb17729f8ab80f39b0a55bc8a79 Mon Sep 17 00:00:00 2001 From: jianghurong Date: Fri, 17 Nov 2023 18:26:57 +0800 Subject: [PATCH 1/2] feat: Gulpfile update --- gulpfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gulpfile.js b/gulpfile.js index 99eabfcb4..8cafb4cf8 100644 --- 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])); }; From 3dfcc2b27d6065deb828b3e1cd57d5f32b9546d5 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 21 Nov 2023 11:36:23 -0500 Subject: [PATCH 2/2] Resolves #1115 clarify git branch f --- src/levels/rampup/relativeRefs2.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/levels/rampup/relativeRefs2.js b/src/levels/rampup/relativeRefs2.js index 5720a7c04..df280e09a 100644 --- 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.*" ] } },