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

more levels

Browse source
This commit is contained in:
Peter Cottle 2013-10-07 21:21:18 -07:00
parent 541ae67fbd
commit fa7b918be9
5 changed files with 544 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ exports.level = {
"Let's first see a `fetch` and a `merge` executed sequentially"
],
"afterMarkdowns": [
"Boom -- we downloaded `C3` with a `fetch` and then merged in that work with `git merge origin/master`. Now our `master` branch reflects the new work from the remote (in this case, named `origin`)"
"Boom -- we downloaded `C3` with a `fetch` and then merged in that work with `git merge o/master`. Now our `master` branch reflects the new work from the remote (in this case, named `origin`)"
],
"command": "git fetch; git merge o/master",
"beforeCommand": "git clone; git commit; git fakeTeamwork"