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

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/9caba48902a60a249d32b9659d04b56fcb2d782b)

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

Visibility: public

Requested revision: 9caba48902a60a249d32b9659d04b56fcb2d782b

Requested commit: 9caba48902a60a249d32b9659d04b56fcb2d782b

Commit: 9caba48902a60a249d32b9659d04b56fcb2d782b

Tree: a6a447a5e45c45fc90e4a34d271bbd896f71257e

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

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

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/9caba48902a60a249d32b9659d04b56fcb2d782b?format=markdown)