almost

src/app.css

@@ -161,6 +161,23 @@ textarea {
   background: #edf8fd;
 }
 
+.notice.conflict {
+  border-color: #e3b778;
+  color: #8a4c0e;
+  background: #fff6e7;
+}
+
+.notice.conflict button {
+  margin-left: auto;
+  min-height: 30px;
+  padding: 0 12px;
+  border-color: #e3b778;
+  color: #8a4c0e;
+  background: #ffffff;
+  font-size: 13px;
+  font-weight: 700;
+}
+
 .workspace {
   display: grid;
   grid-template-columns: 340px minmax(0, 1fr);
@@ -937,6 +954,216 @@ textarea {
   max-height: none;
 }
 
+.dialog-title {
+  margin: 2px 0 0;
+  color: #202326;
+  font-size: 16px;
+}
+
+.resolve-editor {
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr) auto;
+  min-height: 0;
+  padding: 10px;
+  gap: 8px;
+}
+
+.resolve-toolbar {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.resolve-toolbar button {
+  min-height: 32px;
+  padding: 0 10px;
+  font-size: 13px;
+}
+
+.resolve-toolbar-label {
+  color: #596670;
+  font-size: 12px;
+  font-weight: 800;
+}
+
+.resolve-status {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  margin-left: auto;
+  font-size: 12px;
+  font-weight: 700;
+  color: #8a4c0e;
+}
+
+.resolve-textarea {
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  padding: 10px;
+  border: 1px solid #c4ccd3;
+  border-radius: 6px;
+  background: #ffffff;
+  color: #202326;
+  font-family: "Cascadia Code", "SFMono-Regular", Consolas, monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  tab-size: 2;
+  resize: none;
+  white-space: pre;
+}
+
+.resolve-structured {
+  display: grid;
+  align-content: start;
+  gap: 8px;
+  min-height: 0;
+  padding: 4px;
+  overflow: auto;
+  border: 1px solid #dce1e5;
+  border-radius: 6px;
+  background: #ffffff;
+}
+
+.resolve-context {
+  margin: 0;
+  padding: 2px 8px;
+  overflow-x: auto;
+  font-family: "Cascadia Code", "SFMono-Regular", Consolas, monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  tab-size: 2;
+  color: #3a444c;
+}
+
+.resolve-conflict {
+  display: grid;
+  gap: 6px;
+  padding: 8px;
+  border: 1px solid #e3b778;
+  border-radius: 6px;
+  background: #fffaf1;
+}
+
+.resolve-conflict.unresolved {
+  border-color: #d98b8b;
+  background: #fff5f3;
+}
+
+.resolve-conflict-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.resolve-conflict-label {
+  color: #8a4c0e;
+  font-size: 12px;
+  font-weight: 800;
+}
+
+.resolve-choice-buttons {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+}
+
+.resolve-choice-buttons button {
+  min-height: 26px;
+  padding: 0 8px;
+  font-size: 12px;
+}
+
+.resolve-choice-buttons button.active {
+  border-color: #2f6fb0;
+  color: #ffffff;
+  background: #2f6fb0;
+}
+
+.resolve-side {
+  display: grid;
+  gap: 3px;
+  padding: 6px;
+  border: 1px solid #dce1e5;
+  border-radius: 6px;
+  border-left-width: 3px;
+}
+
+.resolve-side.ours {
+  border-left-color: #4aa777;
+  background: #f1faf4;
+}
+
+.resolve-side.theirs {
+  border-left-color: #5a8bd0;
+  background: #f1f5fc;
+}
+
+.resolve-side.dimmed {
+  opacity: 0.45;
+  filter: grayscale(0.4);
+}
+
+.resolve-side-label {
+  font-size: 11px;
+  font-weight: 800;
+  text-transform: uppercase;
+}
+
+.resolve-side.ours .resolve-side-label {
+  color: #1f7a4d;
+}
+
+.resolve-side.theirs .resolve-side-label {
+  color: #2f6fb0;
+}
+
+.resolve-lines {
+  margin: 0;
+  overflow-x: auto;
+  font-family: "Cascadia Code", "SFMono-Regular", Consolas, monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  tab-size: 2;
+}
+
+.resolve-line {
+  display: block;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.resolve-line.ours {
+  color: #176239;
+}
+
+.resolve-line.theirs {
+  color: #255b8b;
+}
+
+.resolve-line.context {
+  color: #3a444c;
+}
+
+.resolve-actions {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+}
+
+.resolve-path {
+  overflow: hidden;
+  color: #6c7882;
+  font-family: "Cascadia Code", "SFMono-Regular", Consolas, monospace;
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .diff-counts {
   display: flex;
   gap: 8px;