/src/levels/rebase/manyRebases.js

https://github.com/j0hnh/learnGitBranching · JavaScript · 157 lines · 157 code · 0 blank · 0 comment · 0 complexity · 392679c32497792fd7455ce0e49eeece MD5 · raw file

  1. exports.level = {
  2. "compareOnlyMasterHashAgnostic": true,
  3. "disabledMap": {
  4. "git revert": true,
  5. "git cherry-pick": true
  6. },
  7. "goalTreeString": "%7B%22branches%22%3A%7B%22master%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22master%22%7D%2C%22bugFix%22%3A%7B%22target%22%3A%22C3%27%22%2C%22id%22%3A%22bugFix%22%7D%2C%22side%22%3A%7B%22target%22%3A%22C6%27%22%2C%22id%22%3A%22side%22%7D%2C%22another%22%3A%7B%22target%22%3A%22C7%27%22%2C%22id%22%3A%22another%22%7D%7D%2C%22commits%22%3A%7B%22C0%22%3A%7B%22parents%22%3A%5B%5D%2C%22id%22%3A%22C0%22%2C%22rootCommit%22%3Atrue%7D%2C%22C1%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C1%22%7D%2C%22C2%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C2%22%7D%2C%22C3%22%3A%7B%22parents%22%3A%5B%22C1%22%5D%2C%22id%22%3A%22C3%22%7D%2C%22C4%22%3A%7B%22parents%22%3A%5B%22C0%22%5D%2C%22id%22%3A%22C4%22%7D%2C%22C5%22%3A%7B%22parents%22%3A%5B%22C4%22%5D%2C%22id%22%3A%22C5%22%7D%2C%22C6%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C6%22%7D%2C%22C7%22%3A%7B%22parents%22%3A%5B%22C5%22%5D%2C%22id%22%3A%22C7%22%7D%2C%22C3%27%22%3A%7B%22parents%22%3A%5B%22C2%22%5D%2C%22id%22%3A%22C3%27%22%7D%2C%22C4%27%22%3A%7B%22parents%22%3A%5B%22C3%27%22%5D%2C%22id%22%3A%22C4%27%22%7D%2C%22C5%27%22%3A%7B%22parents%22%3A%5B%22C4%27%22%5D%2C%22id%22%3A%22C5%27%22%7D%2C%22C6%27%22%3A%7B%22parents%22%3A%5B%22C5%27%22%5D%2C%22id%22%3A%22C6%27%22%7D%2C%22C7%27%22%3A%7B%22parents%22%3A%5B%22C6%27%22%5D%2C%22id%22%3A%22C7%27%22%7D%7D%2C%22HEAD%22%3A%7B%22target%22%3A%22master%22%2C%22id%22%3A%22HEAD%22%7D%7D",
  8. "solutionCommand": "git rebase master bugFix;git rebase bugFix side;git rebase side another;git rebase another master",
  9. "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\"}}",
  10. "name": {
  11. "en_US": "Rebasing over 9000 times",
  12. "de_DE": "10000 Rebases unter dem `HEAD`",
  13. "es_AR": "Rebaseando más de 9000 veces",
  14. "ko": "9천번이 넘는 리베이스",
  15. "ja": "Rebasing over 9000 times",
  16. "zh_CN": "N次Rebase",
  17. "zh_TW": "N次Rebase"
  18. },
  19. "hint": {
  20. "en_US": "Remember, the most efficient way might be to only update master at the end...",
  21. "de_DE": "Nicht vergessen: die effizienteste Möglichkeit könnte sein, schließlich einfach nur den master zu aktualisieren ...",
  22. "es_AR": "Acordate, la manera más eficiente podría ser actualizar master sólo al final...",
  23. "ja": "最も効率的なやり方はmasterを最後に更新するだけかもしれない・・・",
  24. "ko": "아마도 master를 마지막에 업데이트하는 것이 가장 효율적인 방법일 것입니다...",
  25. "zh_CN": "记住,最后更新master分支可能是最高效的方法。",
  26. "zh_TW": "要記住喔! 把 master branch 留到最後更新可能是最有效率的方法。"
  27. },
  28. "startDialog": {
  29. "en_US": {
  30. "childViews": [
  31. {
  32. "type": "ModalAlert",
  33. "options": {
  34. "markdowns": [
  35. "### Rebasing Multiple Branches",
  36. "",
  37. "Man, we have a lot of branches going on here! Let's rebase all the work from these branches onto master.",
  38. "",
  39. "Upper management is making this a bit trickier though -- they want the commits to all be in sequential order. So this means that our final tree should have `C7'` at the bottom, `C6'` above that, and so on, all in order.",
  40. "",
  41. "If you mess up along the way, feel free to use `reset` to start over again. Be sure to check out our solution and see if you can do it in fewer commands!"
  42. ]
  43. }
  44. }
  45. ]
  46. },
  47. "es_AR": {
  48. "childViews": [
  49. {
  50. "type": "ModalAlert",
  51. "options": {
  52. "markdowns": [
  53. "### Rebaseando múltiples ramas",
  54. "",
  55. "Man, ¡hay un montón de ramas acá! Rebaseemos todo el trabajo de esas ramas sobre master.",
  56. "",
  57. "La gente de administración nos está haciendo las cosas un poco complicadas, igual -- quieren que nuestros commits estén todos en orden secuencial. Esto significa que nuestro árbol final tendría que tener `C7` al final, `C6` antes de ese, y así siguiendo, todos en orden.",
  58. "",
  59. "Si hacés líos en el camino, sentite libre de usar `reset` para empezar de nuevo. ¡Asegurate de verificar tu solución y ver si podés hacerla en alguna cantidad menor de commandos!"
  60. ]
  61. }
  62. }
  63. ]
  64. },
  65. "de_DE": {
  66. "childViews": [
  67. {
  68. "type": "ModalAlert",
  69. "options": {
  70. "markdowns": [
  71. "### Mehrere Branches rebasen",
  72. "",
  73. "Wow, wir haben hier ja eine Menge Branches! Lass uns mal die ganze Arbeit, die in diesen Branches steckt, auf den `master` packen, um sie auf Stand zu bringen.",
  74. "",
  75. "Die Führungsetage macht die Sache allerdings etwas trickreicher -- die möchten, dass alle Commits in aufsteigender Reihenfolge geordnet sind. Das heißt unser fertiger Baum sollte `C7` ganz unten haben, darüber `C6` und so weiter und so fort.",
  76. "",
  77. "Upper management is making this a bit trickier though -- they want the commits to all be in sequential order. So this means that our final tree should have `C7'` at the bottom, `C6'` above that, etc etc, etc all in order.",
  78. "Wenn du irgendwo einen Fehler machst, benutz ruhig `reset` um wieder von vorne anzufangen oder `undo` um einen Schrit zurückzugehen. Schau dir die Lösung an und versuch es in weniger Schritten hinzubekommen, als die."
  79. ]
  80. }
  81. }
  82. ]
  83. },
  84. "ja": {
  85. "childViews": [
  86. {
  87. "type": "ModalAlert",
  88. "options": {
  89. "markdowns": [
  90. "### 複数のブランチをリベースする",
  91. "",
  92. "さあ、いくつものブランチが出てきます。このブランチたち全てをmasterブランチにリベースしましょう。",
  93. "",
  94. "おエライさん方が今回の仕事を少しトリッキーにしてくれました ― コミットはすべて一列のシーケンシャルな状態にしてほしいそうです。つまり私たちが作るリポジトリの最終的なツリーの状態は、`C7'`が最後に来て、`C6'`がその一つ上に来て、、と順に積み重なるイメージです。",
  95. "",
  96. "試行錯誤してツリーが汚くなってきたら、`reset`コマンドを使ってツリーの状態を初期化してください。模範解答をチェックして、それよりも簡単なコマンドで済ませられるかどうか、を考えるのも忘れずに!"
  97. ]
  98. }
  99. }
  100. ]
  101. },
  102. "zh_CN": {
  103. "childViews": [
  104. {
  105. "type": "ModalAlert",
  106. "options": {
  107. "markdowns": [
  108. "### 多分支衍合",
  109. "",
  110. "呐,现在我们有很多分支啦!让我们rebase这些分支的工作到 master 分支上吧。",
  111. "",
  112. "但是你的头头找了点麻烦 —— 他们希望得到有序的提交历史,也就是我们最终的结果是 `C7'` 在最底部,`C6'` 在它上面,以此类推。",
  113. "",
  114. "假如你搞砸了,没所谓的(虽然我不会告诉你用 `reset` 可以重新开始)。记得看看我们提供的答案,看你能否使用更少的命令完成任务!"
  115. ]
  116. }
  117. }
  118. ]
  119. },
  120. "zh_TW": {
  121. "childViews": [
  122. {
  123. "type": "ModalAlert",
  124. "options": {
  125. "markdowns": [
  126. "### rebase 多個 branch",
  127. "",
  128. "嗨!現在我們有很多 branch 了啦!讓我們做一下 rebase,將這些分支接到 master branch 上吧。",
  129. "",
  130. "但是你的主管找了點麻煩,他們希望得到有序的 commit history,也就是我們最終的結果是 `C7'` 在最下面,`C6'` 在它上面,以此類推。",
  131. "",
  132. "假如你搞砸了,沒有關係啦!你用 `reset` 就可以重新開始!記得看看我們提供的答案,看你是否能夠使用更少的指令完成這一關!"
  133. ]
  134. }
  135. }
  136. ]
  137. },
  138. "ko": {
  139. "childViews": [
  140. {
  141. "type": "ModalAlert",
  142. "options": {
  143. "markdowns": [
  144. "### 여러 브랜치를 리베이스(rebase)하기 ",
  145. "",
  146. "음, 여기 꽤 여러개의 브랜치가 있습니다! 이 브랜치들의 모든 작업내역을 master에 리베이스 해볼까요?",
  147. "",
  148. "윗선에서 일을 복잡하게 만드네요 -- 그 분들이 이 모든 커밋들을 순서에 맞게 정렬하라고 합니다. 그럼 결국 우리의 최종 목표 트리는 제일 아래에 `C7'` 커밋, 그 위에 `C6'` 커밋, 또 그 위에 순서대로 보여합니다.",
  149. "",
  150. "만일 작업중에 내용이 꼬인다면, `reset`이라고 쳐서 처음부터 다시 시작할 수 있습니다. 모범 답안을 확인해 보시고, 혹시 더 적은 수의 커맨드로 해결할 수 있는지 알아보세요!"
  151. ]
  152. }
  153. }
  154. ]
  155. }
  156. }
  157. };