Error to Update the Eluna

[Aquilla]

I am having difficulty updating the core Eluna. gives the following error :

http://imgur.com/X7N6b5i

 

[Tommy]

Looks like it's an issue on your side, not Eluna's. It plainly says you have unmerged files. If you've done changes and you're trying to pull, it will want you to save the changes.

You can reset to the last commit on the repo by doing:

git reset --hard origin/master

However, if you've done custom changes, I'd just recommend doing:

git add --all
git commit -m "Stash"

Or you can actually 'stash' the commits: http://git-scm.com/book/en/Git-Tools-Stashing. I normally just do the above. Resetting can possibly reset your custom changes, so be careful when doing that.

 

[Aquilla]

I do not know what to do. I am trying to update the core.
have one tutorial Complete, teaching Compile Full Eluna? of 0.

 

[Tommy]

I do not know what to do. I am trying to update the core.
have one tutorial Complete, teaching Compile Full Eluna? of 0.

I just told you could do...

Looks like it's an issue on your side, not Eluna's. It plainly says you have unmerged files. If you've done changes and you're trying to pull, it will want you to save the changes.

You can reset to the last commit on the repo by doing: (OPEN up git console via ElunaTCWotLK source)

git reset --hard origin/master

However, if you've done custom changes, I'd just recommend doing:

git add --all
git commit -m "Stash"

Or you can actually 'stash' the commits: http://git-scm.com/book/en/Git-Tools-Stashing. I normally just do the above. Resetting can possibly reset your custom changes, so be careful when doing that.

 

[Aquilla]

got it, thanks

 

[Foereaper]

Marking as solved