Improve update-skia merge conflict guidance#3662

mattleibow merged 3 commits into

mainmono/SkiaSharp:mainfrom

dev/improve-merge-conflict-guidancemono/SkiaSharp:dev/improve-merge-conflict-guidanceCopy head branch name to clipboard