fix(README): remove mascot left behind by v1.1.0 merge#88
Merged
Conversation
The v1.1.0 develop → main CLI merge auto-combined the banner addition (from develop) with the mascot insertion (on main's history), keeping both. Develop's branch correctly has no mascot — the banner PR #86 removed it deliberately. main ended up with both because git's three-way merge treated them as non-conflicting additions in different positions and kept both. This brings main in line with develop: banner stays, mascot is gone. assets/logo.png file is preserved for potential reuse — open a follow-up PR to delete the file too if it's truly unused. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-Authored-By: amcheste <13696614+amcheste@users.noreply.github.com>
Orphan after the mascot reference was removed from the README in the prior commit. Removing the file too. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-Authored-By: amcheste <13696614+amcheste@users.noreply.github.com>
amcheste
added a commit
that referenced
this pull request
May 12, 2026
The mascot reference was removed from the README in banner PR #86, but the underlying file was left behind for potential reuse. With the file confirmed unused, this deletes it. Develop side of the parallel cleanup. The main-targeting fix (#88) deletes it on main directly to correct the v1.1.0 merge state where the mascot reference unexpectedly survived the develop → main merge. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-Authored-By: amcheste <13696614+amcheste@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The v1.1.0 `develop → main` CLI merge auto-combined the banner addition (from develop) with the mascot insertion (on main's history), keeping both. The banner PR (#86) deliberately removed the mascot line on develop, but git's three-way merge treated the banner addition and the mascot line as non-conflicting changes in different positions, so it kept both.
End state on main right now:
```
<img src="assets/logo.png" ... /> ← carried over from main's pre-merge state
```
This PR brings main in line with develop's intent: banner stays, mascot is gone.
Targeting main directly
Unusual but appropriate here — develop already lacks the mascot, so there's no change to make on develop. The drift is purely a v1.1.0 merge-state issue on main, which this PR corrects.
assets/logo.pngThe file is preserved in `assets/` for potential reuse. If you'd prefer to delete it entirely (it's currently orphan now that the README doesn't reference it), happy to do a follow-up PR removing the file from both branches.