AODocs-Dev/merge-or-pr

This is a github action which can merge a branch to an other or create a PR if there is a conflict.

Github action that tries to merge target branch to selected base branch, and creates pull request with selected assignee on conflict. Useful for git flow hotfixes that have to be merged both to development and main branches.