mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-28 22:55:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge main

Browse source
This commit is contained in:
Peter Cottle 2023-11-21 11:36:43 -05:00
commit d74bcdb708
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gulpfile.js
View file

@ -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]));
};

4
src/levels/rampup/relativeRefs2.js
View file

@ -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.*"
]
}
},