How to deal with merge conflicts?

[ju5t]

We have a Python project that uses boto3 and botocore. They're releasing a new version almost daily. Unfortunately for us they are next to each other in our requirementst.txt which means we have to deal with merge conflicts on a daily basis too.

If we don't, the merge requests (our private repo's are on GitLab) start to pile up.

Merging them automatically wouldn't solve it for us. One will get merged. The other can't, because of a conflict.

What is the recommended method to deal with situations like this? If it isn't possible to merge them, can we ignore patch releases for both packages and focus on minor releases only?

[gperdomor]

related to #306 and https://github.com/dependabot/dependabot-core/issues/1603