NO-JIRA: Handle files deleted in upstream during merge conflict resolution#122

slashpai wants to merge 2 commits intorhobs:mainrhobs/syncbot:mainfrom

slashpai:amslashpai/syncbot:amCopy head branch name to clipboard