Skip to content

Commit 77a9f2b

Browse files
committed
Add instructions on how to merge in scaffolded files
1 parent 228978f commit 77a9f2b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

.github/workflows/scaffold_pkg_via_pull_request_assignment.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,14 @@ jobs:
171171
with:
172172
issue-number: ${{ github.event.pull_request.number }}
173173
body: |
174-
Based off the `README.md` file, the [stdlib-bot](https://github.com/stdlib-bot) has generated contents for the [${{ steps.scaffold.outputs.alias }}](../tree/${{ steps.scaffold.outputs.path }}/${{ steps.scaffold.outputs.dir }}) package.
174+
Based off the `README.md` file, the [stdlib-bot](https://github.com/stdlib-bot) has generated contents for the [${{ steps.scaffold.outputs.alias }}](../tree/scaffold-${{ github.event.pull_request.number }}/${{ steps.scaffold.outputs.path }}/${{ steps.scaffold.outputs.dir }}) package.
175+
176+
From your local fork, make sure you are on the pull request branch and then merge the changes from the upstream repository:
177+
178+
```bash
179+
git checkout {{ github.event.pull_request.head.ref }}
180+
git merge upstream/scaffold-${{ github.event.pull_request.number }}/${{ steps.scaffold.outputs.path }}
181+
```
175182
176183
## Notes
177184

0 commit comments

Comments
 (0)