fix: Merge failures occurring when using different strategies (overwrite with compare, merge base, merge compare)#1917

aman19K merged 4 commits intostagingcontentstack/cli:stagingfrom

hotfix/DX-2957-branches-mergecontentstack/cli:hotfix/DX-2957-branches-mergeCopy head branch name to clipboard