Skip to content

Actions: nguyenalex836/skills-resolve-merge-conflicts

All workflows

Actions

Loading...
Loading

Showing runs from all workflows
11 workflow runs
11 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1 from nguyenalex836/my-resume
Step 0, Welcome #2: Commit 7a1766a pushed by nguyenalex836
December 6, 2023 17:50 12s main
December 6, 2023 17:50 12s
Merge pull request #1 from nguyenalex836/my-resume
Step 4, Merge your pull request #2: Commit 7a1766a pushed by nguyenalex836
December 6, 2023 17:50 28s main
December 6, 2023 17:50 28s
Merge branch 'main' into my-resume
Step 3, Create your own conflict #2: Commit 20da76f pushed by nguyenalex836
December 6, 2023 17:50 12s my-resume
December 6, 2023 17:50 12s
Merge branch 'main' into my-resume
Step 2, Resolve a merge conflict #4: Commit 20da76f pushed by nguyenalex836
December 6, 2023 17:50 14s my-resume
December 6, 2023 17:50 14s
Rename references.md. to references.md
Step 2, Resolve a merge conflict #3: Commit e732cf0 pushed by nguyenalex836
December 6, 2023 17:48 14s my-resume
December 6, 2023 17:48 14s
Rename references.md. to references.md
Step 3, Create your own conflict #1: Commit e732cf0 pushed by nguyenalex836
December 6, 2023 17:48 22s my-resume
December 6, 2023 17:48 22s
Add conflicting text
Step 2, Resolve a merge conflict #2: Commit d13126e pushed by nguyenalex836
December 6, 2023 17:46 12s my-resume
December 6, 2023 17:46 12s
Merge branch 'main' into my-resume
Step 2, Resolve a merge conflict #1: Commit 6cf626d pushed by nguyenalex836
December 6, 2023 17:44 25s my-resume
December 6, 2023 17:44 25s
Resolving merge conflicts
Step 1, Create a pull request #1: Pull request #1 opened by nguyenalex836
December 6, 2023 17:35 25s my-resume
December 6, 2023 17:35 25s
Initial commit
Step 4, Merge your pull request #1: Commit d06723a pushed by nguyenalex836
December 6, 2023 17:25 15s main
December 6, 2023 17:25 15s
Initial commit
Step 0, Welcome #1: Commit d06723a pushed by nguyenalex836
December 6, 2023 17:25 27s main
December 6, 2023 17:25 27s