mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild for Pull #88 Issue #88

Browse source
This commit is contained in:
Peter Cottle 2013-05-17 19:59:17 -07:00
parent eb07e9b409
commit 72e32f2893
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/bundle.js
View file

@ -17912,7 +17912,7 @@ require.define("/levels/intro/merging.js",function(require,module,exports,__dirn
"afterMarkdowns": [ "afterMarkdowns": [
"Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.", "Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
"", "",
"Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo" "Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo!"
], ],
"command": "git checkout bugFix; git merge master", "command": "git checkout bugFix; git merge master",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix" "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
@ -18050,7 +18050,7 @@ require.define("/levels/intro/merging.js",function(require,module,exports,__dirn
"afterMarkdowns": [ "afterMarkdowns": [
"Puisque `bugFix` était un descendant de `master`, git n'avait aucun travail à effectuer; il a simplement déplacé `bugFix` au même commit auquel `master` est attaché.", "Puisque `bugFix` était un descendant de `master`, git n'avait aucun travail à effectuer; il a simplement déplacé `bugFix` au même commit auquel `master` est attaché.",
"", "",
"Maintenant tous les commits sont de la même couleur, ce qui indique que chaque branche contient tout le contenu du dépôt ! Woohoo" "Maintenant tous les commits sont de la même couleur, ce qui indique que chaque branche contient tout le contenu du dépôt ! Woohoo!"
], ],
"command": "git checkout bugFix; git merge master", "command": "git checkout bugFix; git merge master",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix" "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
@ -34022,7 +34022,7 @@ require.define("/src/levels/intro/merging.js",function(require,module,exports,__
"afterMarkdowns": [ "afterMarkdowns": [
"Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.", "Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
"", "",
"Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo" "Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo!"
], ],
"command": "git checkout bugFix; git merge master", "command": "git checkout bugFix; git merge master",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix" "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
@ -34160,7 +34160,7 @@ require.define("/src/levels/intro/merging.js",function(require,module,exports,__
"afterMarkdowns": [ "afterMarkdowns": [
"Puisque `bugFix` était un descendant de `master`, git n'avait aucun travail à effectuer; il a simplement déplacé `bugFix` au même commit auquel `master` est attaché.", "Puisque `bugFix` était un descendant de `master`, git n'avait aucun travail à effectuer; il a simplement déplacé `bugFix` au même commit auquel `master` est attaché.",
"", "",
"Maintenant tous les commits sont de la même couleur, ce qui indique que chaque branche contient tout le contenu du dépôt ! Woohoo" "Maintenant tous les commits sont de la même couleur, ce qui indique que chaque branche contient tout le contenu du dépôt ! Woohoo!"
], ],
"command": "git checkout bugFix; git merge master", "command": "git checkout bugFix; git merge master",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix" "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"

1
build/bundle.min.034684c7.js
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.0de74cdc.js Normal file
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -426,7 +426,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.034684c7.js"></script> <script src="build/bundle.min.0de74cdc.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include