|
116 | 116 | "\n",
|
117 | 117 | "(2) 点击右上角的 “Fork 按钮”,将该仓库 Fork 到你的 Github 账户中\n",
|
118 | 118 | "\n",
|
119 |
| - "\n", |
| 119 | + "\n", |
120 | 120 | "\n",
|
121 | 121 | "(3) 创建一个新分支,可以取名为 `from-<your_username>`,比如,`by git.basic.tutorial`;\n",
|
122 | 122 | "\n",
|
123 |
| - "\n", |
| 123 | + "\n", |
124 | 124 | "\n",
|
125 | 125 | "(4) 在新分支下进行修改某个文件,而后提交 —— 提交前不要嫌麻烦,一定要在 Comment 中写清楚修改说明:\n",
|
126 | 126 | "\n",
|
127 |
| - "\n", |
| 127 | + "\n", |
128 | 128 | "\n",
|
129 | 129 | "以上示例图片中是修改了 README.md 文件 —— 事实上,你应该提交的是的确有必要的校对。\n",
|
130 | 130 | "\n",
|
131 | 131 | "另外,**请注意**:在创建分支之前,要将你的 Fork 更新到最新版。具体操作方法见下一节《如何在 Github 网站上将自己的 Fork 与原仓库同步》。\n",
|
132 | 132 | "\n",
|
133 | 133 | "(5) 在页面顶部选择 Pull request 标签:\n",
|
134 | 134 | "\n",
|
135 |
| - "\n", |
| 135 | + "\n", |
136 | 136 | "\n",
|
137 | 137 | "而后点击 `Compare & pull request` 按钮 —— 如果看不到这个按钮,那就点击下面刚刚修改文件的链接,如上图中的 “Update README.md”(这是你刚刚提交修改时所填写的标题)。\n",
|
138 | 138 | "\n",
|
139 |
| - "\n", |
| 139 | + "\n", |
140 | 140 | "\n",
|
141 | 141 | "确认无误之后,点击 `Create pull request` 按钮。\n",
|
142 | 142 | "\n",
|
143 |
| - "\n", |
| 143 | + "\n", |
144 | 144 | "\n",
|
145 | 145 | "(6) 随后,Github 用户 [@xiaolai](https://github.com/xiaolai) —— 就是我,即,the-craft-of-selfteaching 这个仓库的所有者,会被通知有人提交了 Pull request,我会看到:\n",
|
146 | 146 | "\n",
|
147 |
| - "\n", |
| 147 | + "\n", |
148 | 148 | "\n",
|
149 | 149 | "在我确认这个 Pull request 修改是正确的、可接受的之后,我就会按 `Merge pull request` 按钮 —— 如此这般,一个修正就由你我共同完成了。\n",
|
150 | 150 | "\n",
|
151 |
| - "\n", |
| 151 | + "\n", |
152 | 152 | "\n",
|
153 | 153 | "\n",
|
154 | 154 | "**注意**\n",
|
|
176 | 176 | "source": [
|
177 | 177 | "(1) 在你的 Fork 页面中如下图所示,点击 `Compare` 链接:\n",
|
178 | 178 | "\n",
|
179 |
| - "\n", |
| 179 | + "\n", |
180 | 180 | "\n",
|
181 | 181 | "(2) 将 `base repository` 更改成当前自己的 Fork,在图示中即为 `gitbasictutorial/the-craft-of-selfteaching`:\n",
|
182 | 182 | "\n",
|
183 |
| - "\n", |
| 183 | + "\n", |
184 | 184 | "\n",
|
185 | 185 | "(3) 这时候,页面会显示 `There isn't anything to compare.`,因为你在比较 “自己” 和 “自己”。点击 `compare across forks` 链接:\n",
|
186 | 186 | "\n",
|
187 |
| - "\n", |
| 187 | + "\n", |
188 | 188 | "\n",
|
189 | 189 | "(4) 将 `head repository` 更改成 Upstream Repository(即,上游仓库),在图示中即为 `selfteaching/the-craft-of-selfteaching`:\n",
|
190 | 190 | "\n",
|
191 |
| - "\n", |
| 191 | + "\n", |
192 | 192 | "\n",
|
193 | 193 | "(5) 稍等片刻,你会看到比较结果;而后你可以创建一个 Pull request —— 这是一个由你自己向你自己的 Fork 仓库提交的 Pull request:\n",
|
194 | 194 | "\n",
|
195 |
| - "\n", |
| 195 | + "\n", |
196 | 196 | "\n",
|
197 | 197 | "(6) 而后你在 `Pull requests` 标签页里会看到你刚刚提交的 Pull request:\n",
|
198 | 198 | "\n",
|
199 |
| - "\n", |
| 199 | + "\n", |
200 | 200 | "\n",
|
201 | 201 | "(7) 同意并合并之后的结果是,你的 Fork 与上游仓库同步完成了:\n",
|
202 | 202 | "\n",
|
203 |
| - "\n", |
| 203 | + "\n", |
204 | 204 | "\n",
|
205 | 205 | "当然,有时会出现一些你无法解决的问题,那么,还有一个最后的方法:\n",
|
206 | 206 | "\n",
|
|
0 commit comments