chore: bugfix for two way no merge and better error handling when merging (CM-1117)#4068

themarolt merged 16 commits intomainlinuxfoundation/crowd.dev:mainfrom

better-error-message-handling-CM-1117linuxfoundation/crowd.dev:better-error-message-handling-CM-1117Copy head branch name to clipboard