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.
Hey @dandavison, here's an update for the chameleon theme after some time working with it. I've also added some merge conflict config.
This is how a normal diff looks:
![ksnip_20220726-125310](https://user-images.githubusercontent.com/3176649/180990958-a21621d0-f4df-4d09-b2ca-6ab0c129392f.png)
This is how the merge conflict looks:
![ksnip_20220726-131154](https://user-images.githubusercontent.com/3176649/180992927-93869168-c7f9-49dc-9737-e7baea89f3ca.png)