resolve conflict

Author: brianamarie

config.yml

@@ -7,7 +7,8 @@ template:
 before:
 - type: createIssue
   title: Welcome
-  body: welcome.md
+  body: 00_welcome.md
+- type: updateBranchProtection
 
 # Course artifacts:
 # 1. Issue: Welcome
@@ -28,37 +29,37 @@ steps:
   event: issues.edited
   actions:
   - type: respond
-    with: innersource-v-opensource.md
+    with: 01_innersource-v-opensource.md
+    data: 
+      url: '%actions.ownerPR.data.html_url%'
   - type: closeIssue
   - type: createPullRequest
     title: Repository ownership and names
     head: repo-owner
-    body: repo-owner.md
+    body: 01_repo-owner.md
     action_id: ownerPR
-  - type: respond
-    with: goto-pr.md
-    data: 
-      url: '%actions.ownerPR.data.html_url%'
 
 #2
 - title: Answer the ownership challenge
   description: Discover how repository ownership affects visibility and access.
   link: '{{ repoUrl }}/pull/2'
   event: pull_request.edited
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: repo-owner-answer.md
+    with: 02_repo-owner-answer.md
 
 #3
 - title: Merge the ownership pull request
   description: Beef up your innersource toolkit with resources about repository ownership.
   link: '{{ repoUrl }}/pull/2'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createPullRequest
     title: Create discoverable repos
     head: discoverable-repos
-    body: discoverable.md
+    body: 03_discoverable.md
     action_id: discoverablePR
   - type: respond
     with: goto-pr.md
@@ -71,19 +72,21 @@ steps:
   link: '{{ repoUrl }}/pull/3'
   event: issue_comment.created
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: discoverability-answer.md
+    with: 04_discoverability-answer.md
 
 #5
 - title: Merge the discoverability pull request
   description: Add resources for making discoverable repositories to your innersource toolkit.
   link: '{{ repoUrl }}/pull/3'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createPullRequest
     title: Issue and PR templates
     head: templates
-    body: templates.md
+    body: 05_templates.md
     action_id: templatesPR
   - type: respond
     with: goto-pr.md
@@ -96,19 +99,21 @@ steps:
   link: '{{ repoUrl }}/pull/4'
   event: pull_request.edited
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: templates-answer.md
+    with: 06_templates-answer.md
 
 #7
 - title: Merge the templates pull request
   description: Add starter templates to your innersource toolkit.
   link: '{{ repoUrl }}/pull/4'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createPullRequest
     title: Workflows
     head: workflows
-    body: workflows.md
+    body: 07_workflows.md
     action_id: workflowsPR
   - type: respond
     with: goto-pr.md
@@ -121,19 +126,21 @@ steps:
   link: '{{ repoUrl }}/pull/5'
   event: pull_request.edited
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: workflows-answer.md
+    with: 08_workflows-answer.md
 
 #9
 - title: Merge the workflows pull request
   description: Add branching and workflow strategies to your innersource toolkit.
   link: '{{ repoUrl }}/pull/5'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createPullRequest
     title: Managing projects on GitHub
     head: projects
-    body: projects.md
+    body: 09_projects.md
     action_id: projectsPR
   - type: respond
     with: goto-pr.md
@@ -146,19 +153,21 @@ steps:
   link: '{{ repoUrl }}/pull/6'
   event: pull_request.edited
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: projects-answer.md
+    with: 10_projects-answer.md
 
 #11
 - title: Merge the project management pull request
   description: Beef up your innersource toolkit with project management tips.
   link: '{{ repoUrl }}/pull/6'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createPullRequest
     title: Measuring success
     head: metrics
-    body: metrics.md
+    body: 11_metrics.md
     action_id: metricsPR
   - type: respond
     with: goto-pr.md
@@ -171,18 +180,20 @@ steps:
   link: '{{ repoUrl }}/pull/7'
   event: issue_comment.created
   actions:
+  - type: removeBranchProtection
   - type: respond
-    with: metrics-answer.md
+    with: 12_metrics-answer.md
 
 #13
 - title: Merge the metrics pull request
   description: Add possible metrics to your innersource toolkit.
   link: '{{ repoUrl }}/pull/7'
   event: pull_request.closed
   actions:
+  - type: updateBranchProtection
   - type: createIssue
     title: Publish your toolkit
-    body: publish.md
+    body: 13_publish.md
     action_id: publishIssue
   - type: respond
     with: goto-pr.md
@@ -195,9 +206,10 @@ steps:
   link: '{{ repoUrl }}/pull/8'
   event: deployment
   actions:
+  - type: removeBranchProtection
   - type: respond
     issue: Publish your toolkit
-    with: congratulations.md
+    with: 14_congratulations.md
     data:
       deploymentURL: 'https://%payload.repository.owner.login%.github.io/%payload.repository.name%'
       learningPathURL: 'https://github-learning-lab-staging.herokuapp.com/githubtraining/paths/innersource:-theory-to-practice'

responses/welcome.md responses/00_welcome.mdresponses/welcome.md renamed to responses/00_welcome.md

@@ -4,4 +4,6 @@ Innersource and open source are very similar concepts, but they're not the same.
 
 **Open source** software public and typically accepts contributions from outside of an organization.
 
-**Innersource** is the practice of adopting open source practices internally within your organization. An organization that practices innersource, may or may not end up open sourced.
+**Innersource** is the practice of adopting open source practices internally within your organization. An organization that practices innersource, may or may not end up open sourced.
+
+You can find your next steps in the [next pull request]({{ url }}).