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 docker-compose support #279

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

denisenko93
Copy link

@denisenko93 denisenko93 commented Mar 12, 2022

Added docker-compose file with database images (SqlServer, MySql, PostgreSQL). This changes helps run integration tests localy

@henkmollema
Copy link
Owner

Are you able to resolve the conflicts of maybe create a new PR?

@denisenko93
Copy link
Author

Are you able to resolve the conflicts of maybe create a new PR?

I`m resolved merge conflict

@henkmollema
Copy link
Owner

There are still (or new) merge conflicts. Can you rebase with the master branch?

@denisenko93
Copy link
Author

Done

@henkmollema
Copy link
Owner

@denisenko93 I still cannot merge this branch due to conflicts.

@denisenko93
Copy link
Author

@henkmollema I can`t see any marge conflicts in PR

@henkmollema
Copy link
Owner

image

Perhaps try and apply your changes to fresh branch from the master branch.

@denisenko93
Copy link
Author

I`m rebased my changes with the master branch

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

2 participants