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

PR #178 remove MARCO comments

Browse source
This commit is contained in:
Peter Cottle 2014-06-04 18:48:31 -07:00
parent 20c833763a
commit a04ae67c0e
22 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/levels/rebase/manyRebases.js
View file

@ -9,7 +9,7 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C2\",\"id\":\"master\"},\"bugFix\":{\"target\":\"C3\",\"id\":\"bugFix\"},\"side\":{\"target\":\"C6\",\"id\":\"side\"},\"another\":{\"target\":\"C7\",\"id\":\"another\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C0\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C5\"],\"id\":\"C7\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"name": {
"en_US": "Rebasing over 9000 times",
"de_DE": "10000 Rebases unter dem `HEAD`",//MARCO
"de_DE": "10000 Rebases unter dem `HEAD`",
"es_AR": "Rebaseando más de 9000 veces",
"ko": "9천번이 넘는 리베이스",
"ja": "Rebasing over 9000 times",
@ -17,7 +17,7 @@ exports.level = {
"zh_TW": "N次Rebase"
},
"hint": {
"en_US": "Remember, the most efficient way might be to only update master at the end...",//MARCO
"en_US": "Remember, the most efficient way might be to only update master at the end...",
"de_DE": "Nicht vergessen: die effizienteste Möglichkeit könnte sein, schließlich einfach nur den master zu aktualisieren ...",
"es_AR": "Acordate, la manera más eficiente podría ser actualizar master sólo al final...",
"ja": "最も効率的なやり方はmasterを最後に更新するだけかもしれない・・・",
@ -26,7 +26,7 @@ exports.level = {
"zh_TW": "要記住喔! 把 master branch 留到最後更新可能是最有效率的方法。"
},
"startDialog": {
"en_US": {//MARCO
"en_US": {
"childViews": [
{
"type": "ModalAlert",

6
src/levels/rebase/selectiveRebase.js
View file

@ -10,13 +10,13 @@ exports.level = {
"ko": "브랜치 스파게티",
"en_US": "Branch Spaghetti",
"de_DE": "Branch-Spaghetti",
"es_AR": "Enslada de branches",//MARCO
"es_AR": "Enslada de branches",
"ja": "ブランチスパゲッティ",
"zh_CN": "分支浆糊",
"zh_TW": "branch 漿糊"
},
"hint": {
"en_US": "Make sure to do everything in the proper order! Branch one first, then two, then three",//MARCO
"en_US": "Make sure to do everything in the proper order! Branch one first, then two, then three",
"de_DE": "Stelle sicher, dass du alles in der richtigen Reihenfolge machst! Branche erst one, dann two, dann three.",
"es_AR": "¡Asegurate de hacer las cosas en el orden correcto! Brancheá `one` primero, después `two`, y después `three`.",
"ja": "全て正しい順番で処理すること！oneが最初で、次がtwo、最後にthreeを片付ける。",
@ -25,7 +25,7 @@ exports.level = {
"zh_TW": "確認你是按照正確的順序來操作！先操作 branch `one`, 然後 `two`, 最後才是 `three`"
},
"startDialog": {
"en_US": {//MARCO
"en_US": {
"childViews": [
{
"type": "ModalAlert",