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'm stuck at fixing the conflict in src/pokemon.c
When I open the file (I'm using Notepad++), I cannot find "HEAD" or the string of "===="s anywhere.
The text in my shell looks exact same as yours in the OP at this step (where it's showing the 4 conflicts etc.)
Any idea how I can find the...