Ever thought it'd be cool to have your art, writing, or challenge runs featured on PokéCommunity? Click here for info - we'd love to spotlight your work!
Our weekly protagonist poll is now up! Vote for your favorite Conquest protagonist in the poll by clicking here.
Welcome to PokéCommunity! Register now and join one of the best fan communities on the 'net to talk Pokémon and more! We are not affiliated with The Pokémon Company or Nintendo.
I apologize if this is too big of an ask, but I'm a novice when it comes to resolving merge conflicts, and would appreciate any guidance on these. These occurred when incorporating this into DizzyEgg's stuff. I've included my thoughts on each, to explain where my logic takes me. I guess it's not...
I successfully completed Lunos's guide on installing the DizzyEgg works, but attempting to add another repo to my project just led to more merge conflicts. My first instinct was to resolve the merge conflicts by always replacing the old code with the new code, but I can't imagine that's how...