I don't think Git does that? Regardless, you can't perform a
git pull
if you have uncommitted changes.
Once you pack those uncommitted changes into a commit,
git pull
should be working just fine.
I talk about this here:
https://www.pokecommunity.com/threa...roject-with-the-pokeemerald-expansion.432321/
If your project has a clean Git history though, then you're out of luck when it comes to attempts at automatically merging feature branches.
Your only option is to implement the code changes manually.
GitHub has a Compare feature that lets you check said code changes, thankfully.
Decompilation of Pokémon Emerald. Contribute to pret/pokeemerald development by creating an account on GitHub.
github.com
Thank you for the link to the compare feature, I have made all the changes in my files (unfortunately it doesn't seem I can put in my own version since it's not considered a branch, I didn't know that was a thing to do when I started back in August), anyways now it doesn't want to generate a palette based off of the png I put into the pics folder
<error message>
tools/gbagfx/gbagfx graphics/object_events/pics/pokemon/arceus.png graphics/object_events/pics/pokemon/arceus.4bpp -mwidth 8 -mheight 8
tools/gbagfx/gbagfx graphics/object_events/pics/pokemon/arceus.png graphics/object_events/pics/pokemon/arceus.gbapal
tools/gbagfx/gbagfx graphics/object_events/pics/pokemon/articuno.png graphics/object_events/pics/pokemon/articuno.4bpp -mwidth 4 -mheight 4
"graphics/object_events/pics/pokemon/arceus.png" has an unsupported color type.
tools/gbagfx/gbagfx graphics/object_events/pics/pokemon/articuno.png graphics/object_events/pics/pokemon/articuno.gbapal
make: *** [spritesheet_rules.mk:532: graphics/object_events/pics/pokemon/arceus.4bpp] Error 1
make: *** Waiting for unfinished jobs....
"graphics/object_events/pics/pokemon/articuno.png" has an unsupported color type.
make: *** [spritesheet_rules.mk:478: graphics/object_events/pics/pokemon/articuno.4bpp] Error 1
The image "graphics/object_events/pics/pokemon/articuno.png" does not contain a palette.
The image "graphics/object_events/pics/pokemon/arceus.png" does not contain a palette.
make: *** [Makefile:321: graphics/object_events/pics/pokemon/articuno.gbapal] Error 1
make: *** [Makefile:321: graphics/object_events/pics/pokemon/arceus.gbapal] Error 1
<end error message>
I kinda got the unsupported color type, but I checked and the image shouldn't have more than 16 colors?
(BTW yes I followed the tutorial, I triple checked)