[Help] Updated core changed

[balacas]

Hello,

(First of all I want to say to you that I am French, and having no experience with English, I use a translator. Take it if you do not understand me. Grieve for my poor English)

Here is my problem:

I have change a core with patchs, but I would like I would know how how make an updating while keeping the patchs which I put in my core?

My waiter is devoted under linux ubuntu.

Thanks a lot of your help!

[Unkle Nuke]

Use 'git rebase' to update source without losing patches. git rebase works by setting your patches into a temporary place. Then updates your source to the newest revision of MaNGOS. After, it puts your patches back into the code. If there is a conflict with a patch, use the 'git mergetool' same as you would when merging patches. Once the conflict is fixed, use 'git rebase --continue' to finish rebase.

[balacas]

Thank you for having answered but me is not definitely understood:

I must go in the repertoire of my core, and I must use order ' git rebase ', then me makes a file for my new core and I compile it with a new updating.

But I understand not for what serve 'git rebase' how they use it?

To grieve, I am new I find it difficult to understand...

[darkstalker]

using patches and mantaining them requires a good understand of the code, otherwise you wont be able to solve conflicts (very likely to happen with a modified source)

[balacas]

Thank, I am going to make this this evening, if I have a problem me repost

[Unkle Nuke]

"Git Manual Page" pour la description de l'utilisation de "git rebase" commande, traduit en Français par Google Translate:

git rebase (1) Page de manuel

[balacas]

Thank you UnkleNuke

[balacas]

Hello,

I finally Successful to executer the command. I had the following message:

AUTHORS: needs update

COPYING: needs update

ChangeLog: needs update

Makefile.am: needs update

NEWS: needs update

README: needs update

README.AHBOT: needs update

THANKS: needs update

WARNING: needs update

configure.ac: needs update

sql/Dual_Specialization/mangos_updates_dual_spec.sql: needs update

src/game/Chat.cpp: needs update

src/game/Chat.h: needs update

src/game/Language.h: needs update

src/game/Level0.cpp: needs update

src/game/Player.cpp: needs update

src/game/Player.h: needs update

But then, I have to put my core up to date? How I have to make to put back(to hand) the modifications that I had summits?

[Unkle Nuke]

Sorry for my late reply. Life kept me very busy this past week.

Use git commit -a to commit your changes to whatever branch that you are editing.

[balacas]

Thank you,

Thus I have to apply the command git rebase to my ancient core and I made the command git committed -a on the new.

I am compiling, his should walk if I understood well.

Thank you for your answer:)