mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-03 17:44:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Target branch can't be second argument to merge

Browse source 
Remove instances in tutorial where the target branch for a merge is
supplied as a second argument to `git merge`.  The target branch for
merge is always the current branch.
This commit is contained in:
Aaron Schrab 2013-02-20 21:40:57 -05:00
parent e94710ca64
commit df4452290b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/levels/intro/3.js
View file

@ -37,7 +37,7 @@ exports.level = {
"",
"So here we see that the `master` branch color is blended into all the commits, but the `bugFix` color is not. Let's fix that..."
],
"command": "git merge bugFix master",
"command": "git merge bugFix",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit"
}
},
@ -52,8 +52,8 @@ exports.level = {
"",
"Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo"
],
"command": "git merge master bugFix",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix master"
"command": "git checkout bugFix; git merge master",
"beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
}
},
{