Reply To: Building ES, which branch to use?

[zigurana]

Ok, a small update, and some more questions. This will get deep into Github territory, so bear with me.

Using Netbeans, Ive managed to get a reasonable IDE working in which I can work with and navigate around ES. No SDL syntax support, but it will have to do for now.
Ive had the Gamelist_db branch of ES compiling successfully, by copying the sources to my pi2 and changing the amount of GPU memory to something really low, like 32MB.

My initial approach was to build on the database branch, because it would enable me to set filters (or rather queries) that would accomodate things like favorites and child-proof only games. This seems much more than is currently implemented, so much more, that I became disheartened and started poking around at other peoples Github forks to see if there are other interesting developments going on.

Surely enough, I found this: https://github.com/kaptainkia/EmulationStation.git, which has implemented a favorites list system on the non-db branch, so using the good-old gamelist.xml approach. Fine, now how to get it?

Ideally, I would like to create a fork of the retropie\emulationstation fork, and then somehow, gracefully, merge this pull request into it. As Aloshi is very busy with other things atm, I do not plan on waiting for him to get it in the main emulationstation master/origin (even assuming he likes the changes).

So I started around with creating many forks locally, and trying to find a way to get the changes in, while still keeping the history intact. No luck yet, and I am struggling to find the info on how to approach this. (The frustating thing is that the actual changes only over about 20 files, and if I would have used a manual merge tool like kdiff3 I would have been done by now…)

So great minds of RetroPie, any thoughts on how to get two distant forks together?
I would love to contribute to this project, but need to get some help getting started!

Thanks!