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

PR #247 replace all with objective

Browse source
This commit is contained in:
Peter Cottle 2015-02-24 16:40:04 +08:00
parent c2dce46d46
commit 16f35de32b
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ exports.level = {
"* Commit another time", "* Commit another time",
"* Merge the branch `bugFix` into `master` with `git merge`", "* Merge the branch `bugFix` into `master` with `git merge`",
"", "",
"*Remember, you can always re-display this dialog with \"help level\"!*" "*Remember, you can always re-display this dialog with \"objective\"!*"
] ]
} }
} }
@ -159,7 +159,7 @@ exports.level = {
"* Mach noch einen Commit", "* Mach noch einen Commit",
"* Merge den Branch `bugFix` in `master` mit `git merge`", "* Merge den Branch `bugFix` in `master` mit `git merge`",
"", "",
"*Denk dran, du kannst diese Meldung mit dem Befehl `help level` so oft anzeigen, wie du willst!*" "*Denk dran, du kannst diese Meldung mit dem Befehl `objective` so oft anzeigen, wie du willst!*"
] ]
} }
} }
@ -228,7 +228,7 @@ exports.level = {
"* もう1回コミットする", "* もう1回コミットする",
"* `git merge`コマンドを使って、`bugFix`ブランチを`master`ブランチへとマージする", "* `git merge`コマンドを使って、`bugFix`ブランチを`master`ブランチへとマージする",
"", "",
"*注：\"help level\"コマンドでこのヘルプにいつでも戻ってこれます*" "*注：\"objective\"コマンドでこのヘルプにいつでも戻ってこれます*"
] ]
} }
} }
@ -297,7 +297,7 @@ exports.level = {
"* Hacé otro commit", "* Hacé otro commit",
"* Mergeá la rama `bugFix` a `master` usando `git merge`", "* Mergeá la rama `bugFix` a `master` usando `git merge`",
"", "",
"*Acordate: siempre podés volver a ver este mensaje tipeando \"help level\"!*" "*Acordate: siempre podés volver a ver este mensaje tipeando \"objective\"!*"
] ]
} }
} }
@ -366,7 +366,7 @@ exports.level = {
"* Faça um novo commit", "* Faça um novo commit",
"* Junte o ramo `bugFix` no `master` com `git merge`", "* Junte o ramo `bugFix` no `master` com `git merge`",
"", "",
"*Lembre-se, você pode sempre mostrar esta mensagem novamente com o comando \"help level\"!*" "*Lembre-se, você pode sempre mostrar esta mensagem novamente com o comando \"objective\"!*"
] ]
} }
} }
@ -504,7 +504,7 @@ exports.level = {
"* 再提交一次", "* 再提交一次",
"* 用 `git merge` 合并 `bugFix`分支进 `master`", "* 用 `git merge` 合并 `bugFix`分支进 `master`",
"", "",
"*记住，总是可以用 \"help level\" 命令来重新显示这个对话框！*" "*记住，总是可以用 \"objective\" 命令来重新显示这个对话框！*"
] ]
} }
} }
@ -573,7 +573,7 @@ exports.level = {
"* 再 commit 一次", "* 再 commit 一次",
"* 用 `git merge` 將 `bugFix` merge 到 `master`", "* 用 `git merge` 將 `bugFix` merge 到 `master`",
"", "",
"*記住，你可以用 \"help level\" 指令來重新顯示這個對話框！*" "*記住，你可以用 \"objective\" 指令來重新顯示這個對話框！*"
] ]
} }
} }
@ -642,7 +642,7 @@ exports.level = {
"* 커밋 또 하세요", "* 커밋 또 하세요",
"* `git merge` 명령어로 `bugFix`브랜치를 `master`에 합쳐 넣습니다.", "* `git merge` 명령어로 `bugFix`브랜치를 `master`에 합쳐 넣습니다.",
"", "",
"*아 그리고, \"help level\" 명령어로 이 안내창을 다시 볼 수 있다는 것을 기억해 두세요!*" "*아 그리고, \"objective\" 명령어로 이 안내창을 다시 볼 수 있다는 것을 기억해 두세요!*"
] ]
} }
} }