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

Rebase of PR 170 #226

Conversation

josecelano
Copy link
Member

@josecelano josecelano commented Mar 9, 2023

Hi @WarmBeer, I've rebased your PR, fixing all merge conflicts.

Do you want to rewrite the history of your changes or can we merge it as it's is?

Now you can rewrite your commits if you want to, with the following:

git reset develop
git add -A 
git commit -m "isolated configuration, test-helpers and primitives crates"
git push --force

As you mentioned here.

@josecelano josecelano linked an issue Mar 9, 2023 that may be closed by this pull request
@josecelano josecelano force-pushed the issue-156-fix-random-test-failure-due-to-port-collision branch from 80e84f3 to 4ad9815 Compare March 9, 2023 18:31
@mickvandijke
Copy link
Member

Thank you @josecelano !

it can be merged as is :)

@josecelano
Copy link
Member Author

ACK 4ad9815

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Fix random test failure due to port collision
2 participants