[Solved] Git pull message on [two] server

[Necrovoice]

Hello I was trying to update my files for Mangos two on a Ubuntu OS and I keep getting this message.

Updating ff8b528..70aeabd
error: Your local changes to the following files would be overwritten by merge:
       dep/ACE_wrappers/ace/config.h.in
       dep/ACE_wrappers/configure
Please, commit your changes or stash them before you can merge.
Aborting

Could someone let me know what im missing here? Thanks

[Hikari]

It means you've changed files (which are listed in the error message) in your local repository, which you haven't committed yet.

In fact, git doesn't do anything, as long as you've an unclean repository.

Please, commit your changes or stash them before you can merge.

The decision is up to you.

Either use

git commit -a

in order to keep your changes or use

git stash

to remove the changes (revert) from the files and stash them for later usage.

After you've a clean repository you can pull the update.

[Necrovoice]

ok thanks, must have accidently changed things around.