Check the functions involved in that Merge Conflict, which areI'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 code that needs to be deleted?
PokemonToBattleMon
, and CopyPlayerPartyMonToBattleData
right below it.src/data/pokemon/level_up_learnsets.h
file, as the correct learnsets of the different Pokémon in the pokemon_expansion branch have been incorporated sometime ago. Something that I completely forgot about and UltimaSoul reminded me.LEVEL_UP_MOVE
macro that do have them, saving and moving onto the next.If this specific feature was posted by its creator in an isolated branch of its own, what you have to do is to add that person's repository viaThe question is : When i want to add a specific feature, should i make a branch on my online repository, then git clone it locally and git pull from there ?
git remote
, and then pull the branch where said feature is hosted by using git pull
.git remote add ghoulslash https://github.com/ghoulslash/pokeemerald
git pull ghoulslash bag-sort
git remote
lets you track Ghoul's repository, and git pull
let's you incorporate any of the branches in said repository into your own.Depends on what you are trying to do, branches are usefull for testing features but if you want all those features in one final project, you are going to have to merge them into one branch. I would probably push your working local repo online before pulling a new branch, then pull the new branch into your local battle_engine_v2 branch, fix merge conflict and test everything and only then make a new commit and push it online. That gives you the option of using "git reset --hard" if you made a mistake you cant fix.
There were changes done to that file in the item_expansion branch a few weeks ago. They may conflict with what you already had in it.Auto-merging src/wild_encounter.c
CONFLICT (content): Merge conflict in src/wild_encounter.c
Auto-merging src/pokemon.c
Auto-merging src/pokeball.c
Auto-merging src/party_menu.c
Auto-merging src/item_use.c
Auto-merging src/battle_script_commands.c
Auto-merging src/battle_main.c
Auto-merging src/battle_anim_throw.c
Auto-merging include/wild_encounter.h
Auto-merging include/pokemon.h
Auto-merging include/graphics.h
Auto-merging data/battle_scripts_2.s
Automatic merge failed; fix conflicts and then commit the result.
So I followed the tutorial, and when I try to git pull item expansion, this conflict shows up
Any ideas why?
src/wild_encounter.c
file.include/global.h
.It took me much longer than it should have hadbecause I was terribly lazy, but I finally updated the tutorial covering the merge conflicts atinclude/global.h
.
Sorry for the inconveniences.