Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

Commit 27c010d

Browse files
committed
resolve conflict
2 parents 69ec2fe + a290df2 commit 27c010d

17 files changed

Lines changed: 16 additions & 16 deletions

config.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ template:
77
before:
88
- type: createIssue
99
title: Welcome
10-
body: welcome.md
10+
body: 00_welcome.md
1111

1212
# Course artifacts:
1313
# 1. Issue: Welcome
@@ -28,14 +28,14 @@ steps:
2828
event: issues.edited
2929
actions:
3030
- type: respond
31-
with: innersource-v-opensource.md
31+
with: 01_innersource-v-opensource.md
3232
data:
3333
url: '%actions.ownerPR.data.html_url%'
3434
- type: closeIssue
3535
- type: createPullRequest
3636
title: Repository ownership and names
3737
head: repo-owner
38-
body: repo-owner.md
38+
body: 01_repo-owner.md
3939
action_id: ownerPR
4040

4141
#2
@@ -45,7 +45,7 @@ steps:
4545
event: pull_request.edited
4646
actions:
4747
- type: respond
48-
with: repo-owner-answer.md
48+
with: 02_repo-owner-answer.md
4949

5050
#3
5151
- title: Merge the ownership pull request
@@ -56,7 +56,7 @@ steps:
5656
- type: createPullRequest
5757
title: Create discoverable repos
5858
head: discoverable-repos
59-
body: discoverable.md
59+
body: 03_discoverable.md
6060
action_id: discoverablePR
6161
- type: respond
6262
with: goto-pr.md
@@ -70,7 +70,7 @@ steps:
7070
event: issue_comment.created
7171
actions:
7272
- type: respond
73-
with: discoverability-answer.md
73+
with: 04_discoverability-answer.md
7474

7575
#5
7676
- title: Merge the discoverability pull request
@@ -81,7 +81,7 @@ steps:
8181
- type: createPullRequest
8282
title: Issue and PR templates
8383
head: templates
84-
body: templates.md
84+
body: 05_templates.md
8585
action_id: templatesPR
8686
- type: respond
8787
with: goto-pr.md
@@ -95,7 +95,7 @@ steps:
9595
event: pull_request.edited
9696
actions:
9797
- type: respond
98-
with: templates-answer.md
98+
with: 06_templates-answer.md
9999

100100
#7
101101
- title: Merge the templates pull request
@@ -106,7 +106,7 @@ steps:
106106
- type: createPullRequest
107107
title: Workflows
108108
head: workflows
109-
body: workflows.md
109+
body: 07_workflows.md
110110
action_id: workflowsPR
111111
- type: respond
112112
with: goto-pr.md
@@ -120,7 +120,7 @@ steps:
120120
event: pull_request.edited
121121
actions:
122122
- type: respond
123-
with: workflows-answer.md
123+
with: 08_workflows-answer.md
124124

125125
#9
126126
- title: Merge the workflows pull request
@@ -131,7 +131,7 @@ steps:
131131
- type: createPullRequest
132132
title: Managing projects on GitHub
133133
head: projects
134-
body: projects.md
134+
body: 09_projects.md
135135
action_id: projectsPR
136136
- type: respond
137137
with: goto-pr.md
@@ -145,7 +145,7 @@ steps:
145145
event: pull_request.edited
146146
actions:
147147
- type: respond
148-
with: projects-answer.md
148+
with: 10_projects-answer.md
149149

150150
#11
151151
- title: Merge the project management pull request
@@ -156,7 +156,7 @@ steps:
156156
- type: createPullRequest
157157
title: Measuring success
158158
head: metrics
159-
body: metrics.md
159+
body: 11_metrics.md
160160
action_id: metricsPR
161161
- type: respond
162162
with: goto-pr.md
@@ -170,7 +170,7 @@ steps:
170170
event: issue_comment.created
171171
actions:
172172
- type: respond
173-
with: metrics-answer.md
173+
with: 12_metrics-answer.md
174174

175175
#13
176176
- title: Merge the metrics pull request
@@ -180,7 +180,7 @@ steps:
180180
actions:
181181
- type: createIssue
182182
title: Publish your toolkit
183-
body: publish.md
183+
body: 13_publish.md
184184
action_id: publishIssue
185185
- type: respond
186186
with: goto-pr.md
@@ -195,7 +195,7 @@ steps:
195195
actions:
196196
- type: respond
197197
issue: Publish your toolkit
198-
with: congratulations.md
198+
with: 14_congratulations.md
199199
data:
200200
deploymentURL: 'https://%payload.repository.owner.login%.github.io/%payload.repository.name%'
201201
learningPathURL: 'https://github-learning-lab-staging.herokuapp.com/githubtraining/paths/innersource:-theory-to-practice'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)