Final merge for Issue #165 PR #165

This commit is contained in:
hilojack 2014-03-03 15:45:27 +08:00 committed by Peter Cottle
parent c029a5876f
commit f0913d4e4c
16 changed files with 1197 additions and 7 deletions

View file

@ -4,10 +4,12 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"name": {
"en_US": "Git Pushin'",
"zh_CN": "Git Pushin'",
"de_DE": "Git Push"
},
"hint": {
"en_US": "Remember you have to clone before you can push!",
"zh_CN": "push之前你需要先克隆.",
"de_DE": "Denk dran, dass du einen Clone brauchst bevor du Pushen kannst!"
},
"startDialog": {
@ -52,6 +54,47 @@ exports.level = {
}
]
},
"zh_CN":{
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## Git Push",
"",
"太棒了, 我们已经学习了从远端获取|合并工作到我们的本地工作.但是我们如果分享工作呢?",
"",
"好吧, 上载工作正好同下载工作相反, 那与`git pull`相反的命令是什么? `git push`! ",
"",
"`git push` 负责将你的提交上传到远端, 一旦`git push`完成, 你的朋友就可以在远端下载你的工作了! ",
"",
"你可以将`git push`视为发布你工作的命令. 它有一些特别的地方, 稍后我们会了解到, 我们开始吧."
]
}
},
{
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"这里我们有一个变更, 而远端却没有, 我们先上传吧!"
],
"afterMarkdowns": [
"到了, 远端收到的了`C2`提交, 远端的`master`分支 也被更新并指到了`C2`,我们的远端代表(o/master)也同样被更新了. 所有的东西都被同步了!"
],
"command": "git push",
"beforeCommand": "git clone; git commit"
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"要完成本节, 需要向远端分享两提交. 戒骄戒躁,课程还会更难哦! "
]
}
}
]
},
"de_DE": {
"childViews": [
{