TwitchPlaysPokemon / pbr-movesets

5 stars 16 forks source link

Runmons update #57

Closed Torq-A closed 2 years ago

Torq-A commented 3 years ago
Felk commented 3 years ago

Ignore the changes_info workflow failing. It doesn't like you ending some of your files with ---, causing an additional empty pokeset. It is supposed to ignore those, but it didn't. I fixed it on master

Torq-A commented 3 years ago

Huh. Didn’t know that it did that - I always thought doing it as a marker at the end would work. Will review my pulls later regardless

Felk commented 3 years ago

do you need git assistance with this pull request?

Torq-A commented 3 years ago

What do you mean? I don’t have access to a git computer right now, so I can’t make the changes requested in the discord. Was going to try and set up when I have time available

Felk commented 3 years ago

Just a general question because there's a bunch of merge conflicts

Torq-A commented 3 years ago

For the conflicting files? I mostly just implemented BrawlItUp’s PWT changes with a few extra mons here and there. You can honestly go with either - mine have some extra Pokémon but also have comments showing which Gen V+ moves were replaced

m4-used-rollout commented 2 years ago

Please fix failing checks and merge conflicts, as this will partially address #63