From 7960f9181f57b4e4e04b7352eb7e8feb2109471c Mon Sep 17 00:00:00 2001
From: Jerry Lee <oldratlee@gmail.com>
Date: Sat, 23 Jan 2016 23:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=AF=BB?=
 =?UTF-8?q?=E8=80=85=E7=90=86=E8=A7=A3=20#18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 git-workflows-and-tutorials/workflow-gitflow.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/git-workflows-and-tutorials/workflow-gitflow.md b/git-workflows-and-tutorials/workflow-gitflow.md
index fd37d4f..f81fbcc 100644
--- a/git-workflows-and-tutorials/workflow-gitflow.md
+++ b/git-workflows-and-tutorials/workflow-gitflow.md
@@ -134,11 +134,18 @@ git commit
 否则她可以直接合并到她本地的`develop`分支后`push`到中央仓库：
 
 ```bash
+# 拉取远程的develop分支，并且当前分支（本地分支some-feature）合并上远程分支develop
 git pull origin develop
 git checkout develop
+# 本地分支some-feature合并上some-feature
+#【注意】已经这个分支已经有远程的develop修改了，所以本地develop无需再做远程拉取的操作
 git merge some-feature
 git push
+# 删除本地分支
 git branch -d some-feature
+
+#【译注】上面的命令注释为译者添加，以方便理解
+# 更多说明参见 Issue #18
 ```
 
 第一条命令在合并功能前确保`develop`分支是最新的。注意，功能决不应该直接合并到`master`分支。