Document reconciled PR conflicts
This commit is contained in:
parent
7d3dfbe0b9
commit
4b2c8de161
2 changed files with 172 additions and 0 deletions
170
docs/turns/2026-05-14-1833-reconcile-pr-conflicts.html
Normal file
170
docs/turns/2026-05-14-1833-reconcile-pr-conflicts.html
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Turn Summary: Reconcile PR Conflicts</title>
|
||||
<style>
|
||||
:root {
|
||||
color-scheme: dark;
|
||||
--bg: oklch(15% 0.012 252);
|
||||
--panel: oklch(21% 0.014 252);
|
||||
--panel-2: oklch(25% 0.016 252);
|
||||
--text: oklch(93% 0.01 252);
|
||||
--muted: oklch(72% 0.02 252);
|
||||
--faint: oklch(61% 0.02 252);
|
||||
--accent: oklch(78% 0.15 75);
|
||||
--border: oklch(100% 0.006 252 / 0.12);
|
||||
}
|
||||
|
||||
* { box-sizing: border-box; }
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
background:
|
||||
radial-gradient(circle at top left, oklch(78% 0.15 75 / 0.12), transparent 28rem),
|
||||
var(--bg);
|
||||
color: var(--text);
|
||||
font-family: "IBM Plex Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
||||
line-height: 1.55;
|
||||
}
|
||||
|
||||
main {
|
||||
width: min(920px, calc(100% - 32px));
|
||||
margin: 0 auto;
|
||||
padding: 48px 0 64px;
|
||||
}
|
||||
|
||||
header {
|
||||
margin-bottom: 28px;
|
||||
padding-bottom: 18px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 8px 0 10px;
|
||||
font-size: clamp(2rem, 5vw, 3.2rem);
|
||||
line-height: 1;
|
||||
letter-spacing: -0.04em;
|
||||
}
|
||||
|
||||
h2,
|
||||
.eyebrow {
|
||||
color: var(--accent);
|
||||
font-family: "IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
font-size: 0.74rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.14em;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
h2 { margin: 0 0 10px; }
|
||||
|
||||
p {
|
||||
max-width: 72ch;
|
||||
margin: 0 0 12px;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
section, .summary {
|
||||
margin-top: 18px;
|
||||
padding: 18px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
|
||||
section {
|
||||
border: 1px solid var(--border);
|
||||
background: linear-gradient(180deg, var(--panel-2), var(--panel));
|
||||
}
|
||||
|
||||
.summary {
|
||||
border: 1px solid oklch(78% 0.15 75 / 0.34);
|
||||
background: oklch(78% 0.15 75 / 0.08);
|
||||
}
|
||||
|
||||
ul {
|
||||
margin: 0;
|
||||
padding-left: 1.2rem;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
li + li { margin-top: 8px; }
|
||||
|
||||
code {
|
||||
color: var(--text);
|
||||
font-family: "IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
font-size: 0.92em;
|
||||
}
|
||||
|
||||
.meta {
|
||||
color: var(--faint);
|
||||
font-family: "IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<main>
|
||||
<header>
|
||||
<div class="eyebrow">2026-05-14 18:33</div>
|
||||
<h1>Reconcile PR Conflicts</h1>
|
||||
<p class="meta">Branch: <code>impeccable</code> · Beads issue: <code>islandflow-t8s</code></p>
|
||||
</header>
|
||||
|
||||
<div class="summary">
|
||||
<h2>Summary</h2>
|
||||
<p>
|
||||
Rebasing <code>impeccable</code> onto the latest <code>main</code> exposed a conflict in <code>apps/web/app/terminal.test.ts</code>. The branch now preserves both the terminal hardening coverage from this PR and the ticker parsing coverage already present on <code>main</code>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<section>
|
||||
<h2>Changes Made</h2>
|
||||
<ul>
|
||||
<li>Rebased the PR branch onto <code>origin/main</code>.</li>
|
||||
<li>Resolved the only manual conflict in <code>apps/web/app/terminal.test.ts</code>.</li>
|
||||
<li>Kept both the synthetic admin visibility test and the ticker parsing helper tests.</li>
|
||||
<li>Preserved the rest of the branch changes while letting Git auto-merge the terminal stylesheet and app shell updates.</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Context</h2>
|
||||
<p>
|
||||
The PR already contained terminal UI hardening and responsive adaptation work. The base branch moved underneath it with additional terminal test coverage, so the conflict needed to be reconciled without dropping either set of expectations.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Important Implementation Details</h2>
|
||||
<ul>
|
||||
<li>The conflict was limited to test imports and test blocks, not runtime terminal logic.</li>
|
||||
<li>The merged test file now imports both <code>isSyntheticAdminVisible</code> and <code>parseTickerFilterInput</code>.</li>
|
||||
<li>An explicit <code>undefined</code> case was kept for the admin visibility helper to preserve the stricter branch-side regression coverage.</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Validation</h2>
|
||||
<ul>
|
||||
<li>Ran <code>bun test apps/web/app/terminal.test.ts apps/web/app/routes.test.ts</code>: 65 passing tests.</li>
|
||||
<li>Ran <code>bun --cwd=apps/web run build</code>: production Next.js build completed successfully on the rebased branch.</li>
|
||||
<li>Verified there were no remaining conflict markers in tracked project files before continuing the rebase.</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Issues, Limitations, and Mitigations</h2>
|
||||
<ul>
|
||||
<li>The conflict resolution was test-only, so no additional UI screenshots or browser checks were needed for this turn.</li>
|
||||
<li>The branch history changed because the fix was done via rebase, which requires pushing the updated branch tip back to the PR.</li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Follow-up Work</h2>
|
||||
<p>No further follow-up was identified from this conflict resolution. The branch is ready for PR mergeability to be re-evaluated after push.</p>
|
||||
</section>
|
||||
</main>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue