Add conflict resolution diff UI and app branding

2026-05-13 16:25:28 -04:00
parent 780ff3a02c
commit d359baa010
83 changed files with 4523 additions and 3735 deletions
--- a/apps/web/src/app.tsx
+++ b/apps/web/src/app.tsx
@@ -339,7 +339,10 @@ function WorkspaceView(props: {
      <section class="column-browser" aria-label="Workspace files">
        {columns.map((column) => (
          <div class="browser-column" key={column.prefix || "root"}>
-            <header>{column.title}</header>
+            <header>
+              <Folder size={15} />
+              {column.title}
+            </header>
            <div class="item-list">
              {column.items.map((item) => (
                <button