Resolve conflicts merge develop to release

ita-social-projects / dokazovi-fe

The platform for verified medical speakers and their recommendations.

MIT License

11 stars 9 forks source link

Resolve conflicts merge develop to release #824

Closed YuriyHryshchenko closed 1 year ago

YuriyHryshchenko commented 1 year ago

Type of Pull Request *

[ ] CHANGE (fix or feature that would cause existing functionality to not work as expected)
[ ] FEATURE (non-breaking change which adds functionality)
[ ] BUGFIX (non-breaking change which fixes an issue)
[ ] ENHANCEMENT (non-breaking change which improves existing functionality)
[x] NONE (if none of the other choices apply. For example, tooling, build system, CI, docs, etc.)

Description *

Resolved conflicts to merge develop to release.

YuriyHryshchenko commented 1 year ago

Maybe i should make pull request in release branch straight away? Or do like now: firstly pull request to develop, then pull request from develop to release. Need your advise.

YuriyHryshchenko commented 1 year ago

@skyboyer So i need to merge it in develop, then in release or make directly pull request in release and close this one?