How to merge between 2 branches?

[Endlesskiss]

Hello everybody.

I want to merge the Outdoor and the arena branches (by charlie2025 and balrok).

I am trying for a hour and i can't figure out how to do that....

Can anybody tell me how?

Outdoor: git://github.com/charlie2025/mangos.git

Arena: git://github.com/balrok/mangos.git

Thanks for helpers!

[Wyk3d]

Just pull them one after the other ? If there are merge conflicts you have to solve them though ..

[Endlesskiss]

I get some conflicts but I don't know where are the conflicts, git mergetool doesn't work for me (I didn't exactly what you said in the FAQ...)

there is also no >>>>>> in the conflicted file...

[DasBlub]

just pull both

if you do not have a folder for mangos, do this:

git clone git://github.com/mangos/mangos.git

after that go into the folder. if you want, you can create a new branch (if you have a own repo):

git checkout -b outdoor_arena

after that pull both:

git add remote charlie2025 git://github.com/charlie2025/mangos.git
git add remote balrok git://github.com/balrok/mangos.git
git pull charlie2025 outdoor
git pull balrok arena

after that you have installed both

[Endlesskiss]

Well, It works with Arena, but when trying with Outdoor patch, it tells me it is failed to merge it with master.

I don't know where conflicts are, and therebefore, I can't fix them....

How do I know where are they?

[Wyk3d]

If you didn't have any uncommitted changes before the merge, the only ones you should have after are the conflicted files if any. Just run gitk to see them or git diff.

[Wyk3d]

I didn't exactly what you said in the FAQ...

And you should do something about that attitude if you want to learn anything by the way. Just assume every time you have a problem it's your fault even if it's not. Read everything again, do it again from scratch, maybe find the stuff that aren't obvious and change them a little, see what happens. If all else fails you can always ask ..

[Endlesskiss]

And you should do something about that attitude if you want to learn anything by the way. Just assume every time you have a problem it's your fault even if it's not. Read everything again, do it again from scratch, maybe find the stuff that aren't obvious and change them a little, see what happens. If all else fails you can always ask ..

I know, right after mangos moved to git I used to hate almost everything that was going on.

but I learned that GIT is a great tool, it was great abillities, but hard to use.

I am still trying to do that, I'm recloning mangos again since all those merges fucked up my current mangos (and trying git reset --hard HEAD~3 doesn't work either..)

[freghar]

I am still trying to do that, I'm recloning mangos again since all those merges fucked up my current mangos (and trying git reset --hard HEAD~3 doesn't work either..)

Do a "git clean -d -f" after that reset to remove uncommited, newly added files and directories.