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

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

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

Visibility: public

Requested revision: e20653da80e510a1649f406abe5bf71bc9916d57

Requested commit: e20653da80e510a1649f406abe5bf71bc9916d57

Commit: e20653da80e510a1649f406abe5bf71bc9916d57

Tree: 09393b1129928b77ac0964ccd66ccf2c4024b6bd

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

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

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