Browse code
Fixing two bad files that got borked in the last rebase
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Mary Anthony authored on 2015/03/07 07:21:17Showing 2 changed files
| ... | ... |
@@ -169,23 +169,10 @@ pages: |
| 169 | 169 |
- ['terms/filesystem.md', '**HIDDEN**'] |
| 170 | 170 |
- ['terms/image.md', '**HIDDEN**'] |
| 171 | 171 |
|
| 172 |
-<<<<<<< HEAD |
|
| 173 |
-<<<<<<< HEAD |
|
| 174 |
-# Project: |
|
| 175 |
-- ['project/index.md', '**HIDDEN**'] |
|
| 176 |
-- ['project/who-written-for.md', 'Project', 'README first'] |
|
| 177 |
-======= |
|
| 178 |
-# Contribute: |
|
| 179 |
-- ['project/index.md', '**HIDDEN**'] |
|
| 180 |
-- ['project/project.md', 'Contribute', 'Contributing'] |
|
| 181 |
-# Birthday Tree |
|
| 182 |
-- ['project/who-written-for.md', 'Project', 'README for contributors'] |
|
| 183 |
->>>>>>> a252b2f... Renaming and removing old files |
|
| 184 |
-======= |
|
| 172 |
+ |
|
| 185 | 173 |
# Project: |
| 186 | 174 |
- ['project/index.md', '**HIDDEN**'] |
| 187 | 175 |
- ['project/who-written-for.md', 'Project', 'README first'] |
| 188 |
->>>>>>> 6f40419... Tweaking from last run thru |
|
| 189 | 176 |
- ['project/set-up-prereqs.md', 'Project', 'Set up prerequisites'] |
| 190 | 177 |
- ['project/set-up-dev-env.md', 'Project', 'Work with a development container'] |
| 191 | 178 |
- ['project/test-and-docs.md', 'Project', 'Run tests and test documentation'] |
| ... | ... |
@@ -11,15 +11,7 @@ In this section, you will create a new branch and work on some Docker code that |
| 11 | 11 |
|
| 12 | 12 |
## The basic contribution workflow |
| 13 | 13 |
|
| 14 |
-<<<<<<< HEAD |
|
| 15 |
-<<<<<<< HEAD |
|
| 16 | 14 |
You are about to work through our basic contribution workflow by fixing a single *white-belt* issue in the `docker/docker` repository. The workflow for fixing simple issues looks like this: |
| 17 |
-======= |
|
| 18 |
-You about to work through our basic contribution workflow by fixing a single *white-belt* issue in the `docker/docker` repository. The workflow for fixing simple issues looks like this: |
|
| 19 |
->>>>>>> 6f40419... Tweaking from last run thru |
|
| 20 |
-======= |
|
| 21 |
-You are about to work through our basic contribution workflow by fixing a single *white-belt* issue in the `docker/docker` repository. The workflow for fixing simple issues looks like this: |
|
| 22 |
->>>>>>> 2834bbe... Last minut check pass; fixes |
|
| 23 | 15 |
|
| 24 | 16 |
 |
| 25 | 17 |
|
| ... | ... |
@@ -35,17 +27,9 @@ Triaged issues have either a **white-belt** or **black-belt** label. A **white |
| 35 | 35 |
|
| 36 | 36 |
In the next procedure, you find and claim an open white-belt issue. |
| 37 | 37 |
|
| 38 |
-<<<<<<< HEAD |
|
| 39 |
-<<<<<<< HEAD |
|
| 40 |
-1. Go to the `docker/docker` <a |
|
| 41 |
- href="https://github.com/docker/docker" target="_blank">repository</a>. |
|
| 42 |
-======= |
|
| 43 |
-1. Go to the `docker/docker` repository. |
|
| 44 |
->>>>>>> 6f40419... Tweaking from last run thru |
|
| 45 |
-======= |
|
| 38 |
+ |
|
| 46 | 39 |
1. Go to the `docker/docker` <a |
| 47 | 40 |
href="https://github.com/docker/docker" target="_blank">repository</a>. |
| 48 |
->>>>>>> 2834bbe... Last minut check pass; fixes |
|
| 49 | 41 |
|
| 50 | 42 |
2. Click on the "Issues" link. |
| 51 | 43 |
|
| ... | ... |
@@ -206,15 +190,8 @@ Follow this workflow as you work: |
| 206 | 206 |
alone, you can work on your local host. |
| 207 | 207 |
|
| 208 | 208 |
Review <a href="../set-up-dev-env" target="_blank">if you forgot the details |
| 209 |
-<<<<<<< HEAD |
|
| 210 |
-<<<<<<< HEAD |
|
| 211 |
- of working with a container</a>. |
|
| 212 |
-======= |
|
| 213 |
- of working with a container.</a>. |
|
| 214 |
->>>>>>> 6f40419... Tweaking from last run thru |
|
| 215 |
-======= |
|
| 216 | 209 |
of working with a container</a>. |
| 217 |
->>>>>>> 2834bbe... Last minut check pass; fixes |
|
| 210 |
+ |
|
| 218 | 211 |
|
| 219 | 212 |
3. Test your changes as you work. |
| 220 | 213 |
|