Help for upgrading a custom 2.3 to 2.4 using GIT.

Hi guys,

I'm using a local copy of Moodle_23_STABLE git branch and I did several improvements to it, with the respective commits. Let's call this as 'MY_BRANCH'.  

As I would like to work with the newest Moodle_24_STABLE in my branch I merged it and I got lots of conflicts!

Have I another option to upgrade my local customized moodle 23 to the newest 24 without having to fix millions of conflicts?

Thanks in advance.-Jean