Update Tahoe Juniper (main) with changes from hawthorn/main
#1038
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
github-actions
bot
requested review from
estherjsuh,
melvinsoft,
OmarIthawi and
thraxil
|
@shadinaif this is one of the cases where intricate git work is needed. I think it's a good oppurtunity for us to test the playbook we wrote a white ago: Does this look like a good addition to the next sprint you have? cc: @melvinsoft |
|
Yes @OmarIthawi , Thank you, I'll add a task for it |
|
. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automated pull request from branch
hawthorn/main(Hawthorn) intomain(Juniper).This is meant for making sure all of our Hawthorn changes gets merge into Juniper otherwise Juniper would stall.
If tests passes merge this pull request.
If there are merge conflicts, it needs to be resolved manually in a seperate pull request.