Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-apply local changes after updating main #3

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Conversation

lj-dickey
Copy link

Reapply our local changes to this fork after updating from the upstream repo

mblackmon and others added 2 commits November 29, 2023 15:06
If recording, don't look for the reference image in the bundle, since
this sets the file name for generation later. Instead, look for a local
copy of the file (since we won't be recording tests in CI), so that's where
the new file gets generated.
@lj-dickey lj-dickey merged commit ce751cc into orm Nov 29, 2023
2 of 3 checks passed
@lj-dickey lj-dickey deleted the ticket/local-changes branch November 29, 2023 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants