[Script] Can't find merge conflict?

[Moistnar]

I'm in the process of applying DizzyEgg's modifications to pokeemerald, except I'm running into a serious problem when I try to manually merge the three repositories. So when I pull item_expansion (after pulling battle_engine), I get some merge conflicts, as expected:

Spoiler:

However, when I go to modify the problem code, for example in wild_encounter.c, I can't find the "<<<<<<HEAD" string anywhere in the file:

Spoiler:

I'm completely stumped on how to fix this, every tutorial on merge conflicts assumes that this string insertion happens but for whatever reason it hasn't for me

 

[Lunos]

I'm in the process of applying DizzyEgg's modifications to pokeemerald, except I'm running into a serious problem when I try to manually merge the three repositories. So when I pull item_expansion (after pulling battle_engine), I get some merge conflicts, as expected:

Spoiler:

View attachment 98384

However, when I go to modify the problem code, for example in wild_encounter.c, I can't find the "<<<<<<HEAD" string anywhere in the file:

Spoiler:

View attachment 98385

I'm completely stumped on how to fix this, every tutorial on merge conflicts assumes that this string insertion happens but for whatever reason it hasn't for me

You already brought this up in my tutorial about merging Egg's branches and I already replied.