[Problem] with Git

pcquad · May 23, 2011

git pull git://github.com/balrok/mangos.git alterac
U       src/game/Chat.cpp
U       src/game/Chat.h
U       src/game/GroupHandler.cpp
U       src/game/Level2.cpp
M       src/game/Player.h
U       src/game/Spell.cpp
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

what does that mean and what do i exactly have to do now?

tried:

:~/mangos/src/game# git add src/gamechat.ccp
fatal: pathspec 'src/game/src/gamechat.ccp' did not match any files

Darkknight900 · May 23, 2011

you have merged files:

that means that you will have parts in the files listed like this:

<<<<<<HEAD

code from your source

=========

code from your pull

>>>>>>COMMITNUMBER

these parts must get modifed to work...

then use

git add src/game/Chat.cpp
git add src/game/Chat.h
git add src/game/GroupHandler.cpp
git add src/game/Level2.cpp
git add src/game/Player.h
git add src/game/Spell.cpp

or

git add src/game/*

Sign In

[Problem] with Git

Recommended Posts

pcquad

Link to comment

Share on other sites

Darkknight900

Link to comment

Share on other sites

Recently Browsing 0 members

Contact Us

Repositories

Support

Wiki

Browse

Activity

My Activity Streams

Important Information