search

jpgohlke / twitch-chat-filter

58 stars 37 forks source link

Publish changes? #151

Closed Zephymastyx closed 10 years ago

Zephymastyx commented 10 years ago

Hi, it's been a while and I tried adding a little change (Currently, the single most annyoing thing in the chat for me is that "this room is now in slow mode" messages are repeated every ~20 seconds, I hid those if the time limit is the same as already set).

When I try to make a pull request to get the changes into the gh-pages branch, it tells me the commit histories are entirely different and it cannot be merged. Wat do?

jpgohlke commented 10 years ago

Just submit a pull request for the Master branch. I'll merge it in and then overlay the change onto the gh-pages branch so that it becomes public.

Zephymastyx commented 10 years ago

I already commited (see e1bc08dbb3) as it was a minor fix and I had trouble setting up my local fork again.. I just wanted the change uploaded quickly as those slowmode messages are getting really annoying.

jpgohlke commented 10 years ago

Done.