[Other] Problem with pulling from other repositories

[Vitalo]

Hey,

I'm pretty new to decomp hacking and run into a problem setting up the base for my project. So maybe I just tell you briefly what I've done so far. First I used this guide ([Tutorial] How to build the decomps using WSL (Win10) by Lunos) to set everything up and get a basic idea about what I need. After that I followed this tutorial (Pokeemerald How to start a project using DizzyEgg's works) to get a base to work with and learn how to deal with merge conflicts and set up my own repository. Then I've seen that there is already a merged version of DizzyEgg's works available in the rhh github. I've decided to clone this into a new folder, compile it and use it as my base from now on. I've also pushed this version in my own github repository to have an online back-up. I hope this is alright so far.


Ok, now to my problem. How can I pull branches from other repositories to merge them with my master branch? And how can I push this branch into my own repository?

For example I wanted to pull the "DS-Style party screen" from TheXaman.
So I used the following commands:

git remote add xaman https://github.com/TheXaman/pokeemerald/

git pull xaman party_screen_ds_style2

But then the following window pops up.

And honestly I have no idea what to do from now on. This hasn't happened when I followed the tutorial how to merge the item_expansion with the battle_engine. Have I forgotten something.
I'd be very thankful if someone can point out what I've done wrong. Because I want to merge a few branches into my master branch to get various new features. :D

But I have to say that decomp hacking looks like a very interesting topic. So far I'm only used to binary hacking. It's time to change that :)

 

[Lunos]

For example I wanted to pull the "DS-Style party screen" from TheXaman.
So I used the following commands:

git remote add xaman https://github.com/TheXaman/pokeemerald/

git pull xaman party_screen_ds_style2

But then the following window pops up.
View attachment 95748
And honestly I have no idea what to do from now on.

The commits you pulled were merged into your branch successfully, and now Git is making you store everything in a commit symbolizing the merge.
What you're seeing is Nano, a command line based text editor.
In it, you can modify the commit title if you want to, or leave it as is. Once you're done, just press Ctrl+X to complete the merge.