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

add support for file_bytes argument with managed_file_context() #15

Closed
wants to merge 3 commits into from

Conversation

Johnmaras
Copy link

Original PR camelot-dev#270

@Johnmaras Johnmaras marked this pull request as ready for review March 26, 2024 15:21
@Johnmaras
Copy link
Author

That's my first across-repos PR so let me know if I did anything wrong.
Looks good to me though :)

@bosd
Copy link
Collaborator

bosd commented Mar 26, 2024

I think you followed the right procedure.
Yet there are some merge conflicts here.
I tried to resolve them, locally by following the command line instructions mentioned here on a rebase.
After that I pushed them on a new branch.
But that created a lot of dirty commits..

So, Decided to give the cherry pick approach a go.
The merge conflicts and suggestions where a lot cleaner.

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.

None yet

4 participants