[Tool] [pokeemerald] Merging multiple branches into one. Am I doing something wrong?

[mynameisPooky]

Hello!

This is my first post here, so I apologize if this is in the wrong spot. For the past few months I've been messing around with the pokeemerald decomp in order to learn it. I've made a few small changes in a custom repo, but now I'm ready to dive in deeper and fork the original repo. My goal is to fork the repo, add the expansion, some stuff from ghoul, among other things. The problem I'm running into is with merging. I can fork it just fine (both the original pret repo and the expansion repo) but when it comes to pulling other's code into my own (for example, ghoul's overworld expansion) I always have to merge conflicting files. It seems like a number of these feature branches are out of date, so even merging them in a way I would believe is correct ends up breaking it. Am I doing something wrong in how I'm merging the feature branches, or are they just out of date and need a lot of manual fixing? It seems like whichever way I resolve the merge conflicts the code has compilation errors.

Maybe I just need some confirmation that I am doing this correctly and the out of date / merge conflicts is normal haha. Should I be forking an older version of the repo so that there's fewer conflicts/compatibility issues?

If none of the above is clear about my problem I'd be happy to discuss it further. Thanks!

 

[Lunos]

Hello!

This is my first post here, so I apologize if this is in the wrong spot. For the past few months I've been messing around with the pokeemerald decomp in order to learn it. I've made a few small changes in a custom repo, but now I'm ready to dive in deeper and fork the original repo. My goal is to fork the repo, add the expansion, some stuff from ghoul, among other things. The problem I'm running into is with merging. I can fork it just fine (both the original pret repo and the expansion repo) but when it comes to pulling other's code into my own (for example, ghoul's overworld expansion) I always have to merge conflicting files. It seems like a number of these feature branches are out of date, so even merging them in a way I would believe is correct ends up breaking it. Am I doing something wrong in how I'm merging the feature branches, or are they just out of date and need a lot of manual fixing? It seems like whichever way I resolve the merge conflicts the code has compilation errors.

Maybe I just need some confirmation that I am doing this correctly and the out of date / merge conflicts is normal haha. Should I be forking an older version of the repo so that there's fewer conflicts/compatibility issues?

If none of the above is clear about my problem I'd be happy to discuss it further. Thanks!

git pull is the correct way to go about implementing feature branches.
Some branches do cause merge conflicts, but that's to be expected either because they may be a bit out of date, or because they make changes to a file that clash with the changes that someone else (you, the expansion, etc) already made to it.
I explain this in my tutorial about Git basics, but merge conflicts are something you just have to deal with.
It's either that, or implementing feature branches manually by copy-pasting their modifications straight from their diff.
Ex: https://github.com/pret/pokeemerald/compare/master...ghoulslash:pokeemerald:overworld-expansion