search

henkmollema / Dommel

CRUD operations with Dapper made simple.
MIT License
611 stars 99 forks source link

Add docker-compose support #279

Open denisenko93 opened 2 years ago

denisenko93 commented 2 years ago

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

henkmollema commented 1 year ago

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

denisenko93 commented 1 year ago

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

I`m resolved merge conflict

henkmollema commented 1 year ago

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

denisenko93 commented 1 year ago

Done

henkmollema commented 1 year ago

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

denisenko93 commented 1 year ago

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

henkmollema commented 1 year ago

image

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

denisenko93 commented 1 year ago

I`m rebased my changes with the master branch