Resolve conflict on StoreHeader
Origin/main moved ahead while your branch was being edited. Trunk rebased automatically and found one primitive-level conflict. Compare base, your work, and origin — then accept an AI-assisted result or resolve it yourself.
PrimitiveStoreHeadercomponent
Theirs (d140)#140 · Refactor StoreHeader → semantic <header>
Base: main @ 3d ago
C
Base
mainunchangedStoreHeader · v1
Original — plain <div> with logo + nav + cart.
Norrland
Shop · Journal · Account
🛒 2
<div class="store-header">…</div>
Yours · #7
local branchStoreHeader · v2 (yours)
Same wrapper — added a Wishlist button so users can save recs from the cart.
Norrland
Shop · Journal · Account
♡ 0
🛒 2
<div class="store-header"> · + button.wishlist
Origin · #140
origin/mainStoreHeader · semantic
Wraps the whole header in <header role="banner"> and moves the logo into <h1>. Same visual, better a11y.
Norrland
Shop · Journal · Account
🛒 2
<header role="banner"> · h1 for logo
Resolved · what will land on main
AI suggested merge
Trunk suggests combining the semantic wrapper from #140 with the wishlist button from #7.
Live preview · real HTML
Outcome: semantic
<header role="banner"> + the new Wishlist button. Both changes preserved.Primitive-level diff
~root element → <header role="banner">
·logo.norrland
~logo-text → h1.norrland
·nav.primary
+button.wishlist
·button.cart
+ add~ modify− remove· same
Strategy
When you accept, Trunk rebases
7-add-recs-empty-state onto main with the resolved StoreHeader. Delta #140's slices remain untouched.