You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by jb...@apache.org on 2017/12/12 07:05:52 UTC
[34/51] incubator-servicecomb-website git commit: fix typos for git
rebase command
fix typos for git rebase command
Project: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/commit/e77aae5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/tree/e77aae5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/diff/e77aae5c
Branch: refs/heads/asf-site
Commit: e77aae5cc99d9fc68ffc8942ef19242e2af4b0a5
Parents: aeb85a0
Author: eshaoliu <li...@gmail.com>
Authored: Mon Nov 27 19:02:50 2017 +0800
Committer: Willem Jiang <ji...@huawei.com>
Committed: Mon Nov 27 19:12:53 2017 +0800
----------------------------------------------------------------------
_developers/cn/submit-codes.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-servicecomb-website/blob/e77aae5c/_developers/cn/submit-codes.md
----------------------------------------------------------------------
diff --git a/_developers/cn/submit-codes.md b/_developers/cn/submit-codes.md
index 3a260be..4db1a99 100644
--- a/_developers/cn/submit-codes.md
+++ b/_developers/cn/submit-codes.md
@@ -115,7 +115,7 @@ fig-2 Create pull request
此时会弹出修改记录的文件，一般直接保存即可。然后会提示哪些文件出现了冲突，此时可打开冲突文件对冲突部分进行修改，将提示的所有冲突文件的冲突都解决后，执行
```bash
git add .
- git reabse --continue
+ git rebase --continue
```
依此往复，直至屏幕出现类似 *rebase successful* 字样即可，此时您可以进行往提交PR的分支进行更新：
```bash