feat: add conflict descriptions and file sync context menu#126

ethanndickson merged 2 commits intomaincoder/coder-desktop-macos:mainfrom

ethan/conflicts-desc-and-fs-context-menucoder/coder-desktop-macos:ethan/conflicts-desc-and-fs-context-menuCopy head branch name to clipboard