Add instructions for handling git conflicts#1

rkorszun wants to merge 1 commit intorelosigma:mainrelosigma/main:mainfrom

rkorszun:patch-1rkorszun/main:patch-1Copy head branch name to clipboard