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

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

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

Visibility: public

Requested revision: 39e98586a5ffebd8b705022f9c3cae788006a304

Requested commit: 39e98586a5ffebd8b705022f9c3cae788006a304

Commit: 39e98586a5ffebd8b705022f9c3cae788006a304

Tree: 4460cff7db0af84817b32f1b27b46af97fde0968

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

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

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