Skip to content

Update modern-chat: Bug fix (issue 24)#11508

Merged
iProdigy merged 3 commits into
runelite:masterfrom
BenDol:fix/24
Apr 15, 2026
Merged

Update modern-chat: Bug fix (issue 24)#11508
iProdigy merged 3 commits into
runelite:masterfrom
BenDol:fix/24

Conversation

@BenDol
Copy link
Copy Markdown
Contributor

@BenDol BenDol commented Apr 14, 2026

@runelite-github-app
Copy link
Copy Markdown

runelite-github-app Bot commented Apr 14, 2026

@runelite-github-app
Copy link
Copy Markdown

runelite-github-app Bot commented Apr 14, 2026

This plugin requires a review from a Plugin Hub maintainer. The reviewer will request any additional changes if needed.


Internal use only: Reviewer details Maintainer details

@Felanbird
Copy link
Copy Markdown
Contributor

Felanbird commented Apr 14, 2026

What's happening here, why are you submitting us two three* different changes that conflict each other?

@BenDol
Copy link
Copy Markdown
Contributor Author

BenDol commented Apr 15, 2026

What's happening here, why are you submitting us two three* different changes that conflict each other?

There shouldn't be any conflicts in these changes, where are you seeing that? These are 3 different bug fixes that are independent of each other.

@tylerwgrass
Copy link
Copy Markdown
Member

Merging one fix causes the branches to conflict, as should be expected.

@iProdigy iProdigy added the waiting for author waiting for the pr author to make changes or respond to questions label Apr 15, 2026
@BenDol
Copy link
Copy Markdown
Contributor Author

BenDol commented Apr 15, 2026

Merging one fix causes the branches to conflict, as should be expected.

I see, I forgot we're just passing the commit sha in the file, I was thinking my changes were clashing.

EDIT: I'll just do fixes one at a time next time I suppose.

@runelite-github-app runelite-github-app Bot removed the waiting for author waiting for the pr author to make changes or respond to questions label Apr 15, 2026
@iProdigy iProdigy added the waiting for author waiting for the pr author to make changes or respond to questions label Apr 15, 2026
@runelite-github-app runelite-github-app Bot removed waiting for author waiting for the pr author to make changes or respond to questions size-s labels Apr 15, 2026
@BenDol BenDol closed this Apr 15, 2026
@BenDol BenDol reopened this Apr 15, 2026
@iProdigy iProdigy merged commit 4191a9d into runelite:master Apr 15, 2026
4 of 5 checks passed
Infinitay pushed a commit to Infinitay/plugin-hub that referenced this pull request Apr 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

GIM Group Chat Channel Issues

4 participants