# fix: repair conflict-marker artifacts from rebase auto-resolutions · stienswout/t3code

[View on GitCafe](https://git.cafe/stienswout/t3code/commit/2efec0bea2e1919dd6cad74257ef6b15fa3330d9)

Repository: [stienswout/t3code](https://git.cafe/stienswout/t3code)

Visibility: public

Requested revision: 2efec0bea2e1919dd6cad74257ef6b15fa3330d9

Requested commit: 2efec0bea2e1919dd6cad74257ef6b15fa3330d9

Commit: 2efec0bea2e1919dd6cad74257ef6b15fa3330d9

Tree: 656b55dac1454c935ec797301e886667bc1e90b9

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
fix: repair conflict-marker artifacts from rebase auto-resolutions

rerere replayed stale resolutions during the rebase and committed nested
conflict markers in several files. Restore the branch-intended v2 shapes
and re-graft main's compatible additions (pending-card opacity comments,
theme-editor keybinding test, mobile scroll re-arm effects from #5566).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

```

## Parents

- [8e206ee5015545f294f1596122666106a83630f4](https://git.cafe/stienswout/t3code/commit/8e206ee5015545f294f1596122666106a83630f4?format=markdown)

[Source at this commit](https://git.cafe/stienswout/t3code/tree/2efec0bea2e1919dd6cad74257ef6b15fa3330d9?format=markdown)