mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-21 03:05:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebuilding for CameronWills

Browse source
This commit is contained in:
Peter Cottle 2013-02-18 07:45:35 -08:00
parent 06ca6b372a
commit 0d295197ac
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -60,6 +60,7 @@ Also huge shoutout for everyone who has put up a pull request that was pulled:
* Luke Kysow - 2
* Adam Brodzinski
* Hamish Macpherson
* Cameron Wills
Or reported an issue that was successfully closed!

4
build/bundle.js
View file

@ -17249,7 +17249,7 @@ require.define("/src/levels/intro/4.js",function(require,module,exports,__dirnam
"beforeMarkdowns": [
"Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)",
"",
"We would like to move our work from bugFix directly onto the work from master. That way it woud look like these two features were developed sequentially, when in reality they were developed in parallel.",
"We would like to move our work from bugFix directly onto the work from master. That way it would look like these two features were developed sequentially, when in reality they were developed in parallel.",
"",
"Let's do that with the `git rebase` command"
],
@ -28638,7 +28638,7 @@ require.define("/src/levels/intro/4.js",function(require,module,exports,__dirnam
"beforeMarkdowns": [
"Here we have two branches yet again; note that the bugFix branch is currently selected (note the asterisk)",
"",
"We would like to move our work from bugFix directly onto the work from master. That way it woud look like these two features were developed sequentially, when in reality they were developed in parallel.",
"We would like to move our work from bugFix directly onto the work from master. That way it would look like these two features were developed sequentially, when in reality they were developed in parallel.",
"",
"Let's do that with the `git rebase` command"
],

2
build/bundle.min.2e2f865d.js → build/bundle.min.04e3ef79.js
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

@ -409,7 +409,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.2e2f865d.js"></script>
<script src="build/bundle.min.04e3ef79.js"></script>
<!-- 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