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

Apply patch from SDK #1

Merged
merged 1 commit into from
Jul 18, 2022
Merged

Apply patch from SDK #1

merged 1 commit into from
Jul 18, 2022

Conversation

shamsasari
Copy link

@shamsasari shamsasari commented Jul 15, 2022

Markers have been added around each modification to make it easier to track our changes when merge conflicts with upstream occur.

Markers have been added around each modification to make it easier to track our changes when merge conflicts with upstream occur.
Copy link

@ac101m ac101m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@ac101m
Copy link

ac101m commented Jul 18, 2022

Looks good to me!

Whoops, didn't notice this was still WIP.

@shamsasari shamsasari marked this pull request as ready for review July 18, 2022 10:05
@shamsasari
Copy link
Author

This will merge after #2

@filipesoliveira
Copy link

It looks OK.

@shamsasari
Copy link
Author

Just updated the patch with Conclave start and Conclave end comments surrounding our modifications.

@anien
Copy link

anien commented Jul 18, 2022

LGTM.

@shamsasari
Copy link
Author

@filipesoliveira in the standup we said that we would commit the patch to the repo. Just to be clear, we're not committing the actual patch file, but applying the diff as a PR here. Sorry for the confusion.

@shamsasari shamsasari merged commit 31484b7 into conclave/master Jul 18, 2022
@shamsasari shamsasari deleted the shams-apply-patch branch July 18, 2022 11:12
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.

4 participants