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

Resolves #540

Browse source
This commit is contained in:
Peter Cottle 2019-02-20 14:14:24 -08:00
parent 8fdc28983e
commit e4fd206551
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/remote/pullArgs.js
View file

@ -74,7 +74,7 @@ exports.level = {
"If we specify the place to fetch, everything happens as before with fetch but we merge in whatever was just fetched" "If we specify the place to fetch, everything happens as before with fetch but we merge in whatever was just fetched"
], ],
"afterMarkdowns": [ "afterMarkdowns": [
"See! by specifying `master` we downloaded commits onto `o/master` just as normal. Then we merged `o/master` to where we are, *regardless* of what was currently checked out." "See! by specifying `master` we downloaded commits onto `o/master` just as normal. Then we merged `o/master` to our currently checked out location which is *not* the local branch `master`. For this reason it can actually make sense to run git pull multiple times (with the same args) from different locations in order to update multiple branches."
], ],
"command": "git pull origin master", "command": "git pull origin master",
"beforeCommand": "git clone; go -b bar; git commit; git fakeTeamwork" "beforeCommand": "git clone; go -b bar; git commit; git fakeTeamwork"