Add another mangos-project as new branch to my project [git]

[kelthuzad]

Hi there =)

I have an own mangos project with some custom stuff, forked from mangos-master.

Now I would like to add a new branch to my project, that contains the master-branch from another mangos-forked project.

I think this should be possible somehow, as both projects are forked from the same project: mangos.

Unforutanely I'm not (yet) that much of a git expert, and until now I only managed it to create the new branch and then pull the other project into this branch.

But this would mean I had to merge all the conflicts of my custom things and his custom things, althoug I know I only want his code.

So is there any way to add the other projects master-branch as branch to my project without manually merging everything together?

Hope someone can tell me what to do,

btw merry christmas everyone

[Darkknight900]

sure you can.

a way is that you just start a new branch on the latest commit of mangos

that would look like that:

git branch clean_mangos 28004eafbf0cce32ad1acd4a1c9d1fe9228fc896

and voilá you just got a clean mangos core beside your project.

[xuke771]

git fetch git://github.com/mangos/mangos.git master:your branch

maybe look like this?

[Darkknight900]

Yeah also a way to handle this

and its a way shorter ^^

because for the commit number you need also a fetch of the mangos repo