Merge failed

[DigiBanks99]

Hi. This morning when I tried to update, git gave me this error:

Auto-merging src/mangosd/Makefile.am

CONFLICT (content): Merge conflict in src/mangosd/Makefile.am

Automatic merge failed; fix conflicts and then commit the result.

When I open it with git GUI, this is what the "conflict" says:

@@@ -46,15 -46,14 +46,18 @@@ mangos_worldd_LDADD =

../shared/Config/libmangosconfig.a \\

../shared/Auth/libmangosauth.a \\

../shared/libmangosshared.a \\

../shared/vmap/libmangosvmaps.a \\

../framework/libmangosframework.a \\

- ../../dep/src/sockets/libmangossockets.a \\

../../dep/src/g3dlite/libg3dlite.a \\

../../dep/src/gsoap/libgsoap.a

<<<<<<< HEAD

+mangos_worldd_LDFLAGS = -L../../dep/src/sockets -L../../dep/src/g3dlite -L../../dep/src/gsoap -L../bindings/ScriptDev2/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic

=======

+ mangos_worldd_LDFLAGS = -L../../dep/src/g3dlite -L../../dep/src/gsoap -L../bindings/universal/ -L$(libdir) $(MANGOS_LIBS) -export-dynamic

>>>>>>> origin/master

## Additional files to include when running 'make dist'

# Include world daemon configuration

EXTRA_DIST = \\

mangosd.conf.dist

What steps do I take to fix this?

[przemratajczak]

reset your source, than install for example tortoise SVN and merge again. when merge confict message emerge use command "git mergetool". It will display "mine" and "theirs" windows with highligted conflicted parts. Than you can read mismatching hunks and add it manualy.