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

Fix punctuation

Browse source
This commit is contained in:
Allen Guo 2013-05-17 12:12:54 -04:00
parent 976e8eff4a
commit 1b7c77506e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/intro/merging.js
View file

@ -63,7 +63,7 @@ exports.level = {
"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"