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

Merge pull request #224 from zhyu/fix-zh_CN-typo

Browse source 
fix typo in zh_CN translate
This commit is contained in:
Peter Cottle 2014-11-23 00:49:09 -08:00
commit 59ac8fcadf
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -424,7 +424,7 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"想完成此关，执行收下操作：",
"想完成此关，执行以下操作：",
"",
"* 创建新分支 `bugFix` ",
"* 用 `git checkout bugFix` 切换到 `bugFix`分支",

2
src/levels/intro/rebasing.js
View file

@ -380,7 +380,7 @@ exports.level = {
"beforeMarkdowns": [
"这里，还是有两个分支；注意当前分支是 bugFix（看那颗星）",
"",
"我们想要把 bugfix 里面的工作直接移到 master 分支上。使用这个方法，两个分支的功能看起来像是按顺序开发，实际上它们是平行开发的。",
"我们想要把 bugFix 里面的工作直接移到 master 分支上。使用这个方法，两个分支的功能看起来像是按顺序开发，实际上它们是平行开发的。",
"",
"用 `git rebase`实现此目标"
],