Update workflow files with names

heiskr · heiskr · commit 8ce7268a8259 · 2022-02-03T10:46:19.000-08:00
diff --git a/.github/workflows/1-resolve-a-merge-conflict.yml b/.github/workflows/1-resolve-a-merge-conflict.yml
@@ -1,4 +1,4 @@
-name: Step 1, TBD
+name: Step 1, Resolve a merge conflict
 
 # This step triggers after TBD
 # This step sets STEP to 2
diff --git a/.github/workflows/2-create-your-own-conflict.yml b/.github/workflows/2-create-your-own-conflict.yml
@@ -1,4 +1,4 @@
-name: Step 2, TBD
+name: Step 2, Create your own conflict
 
 # This step triggers after TBD
 # This step sets STEP to 3

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Step 1, TBD`
	`1`	`+name: Step 1, Resolve a merge conflict`
`2`	`2`
`3`	`3`	`# This step triggers after TBD`
`4`	`4`	`# This step sets STEP to 2`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Step 2, TBD`
	`1`	`+name: Step 2, Create your own conflict`
`2`	`2`
`3`	`3`	`# This step triggers after TBD`
`4`	`4`	`# This step sets STEP to 3`