PDA

View Full Version : TrinityCore 3.3.5 Transmog Script Rochet2



Minodevs
07-17-2016, 02:24 PM
Hello Guys when i`ve Trying to Git pull files i getting that Error a when i pulling how i can fix it that, issue

https://s32.postimg.org/5d7d2tvk5/Transmog.png

Rochet2
07-17-2016, 02:28 PM
do what the error says.
commit your local changes or stash them.

Once you get the pull to succeed you should pop your stash and fix the merge conflicts if you stashed your changes.
Or if you committed your changes then after the pull you should fix the conflicts if any and commit the merge with git commit

Minodevs
07-17-2016, 03:23 PM
do what the error says.
commit your local changes or stash them.

Once you get the pull to succeed you should pop your stash and fix the merge conflicts if you stashed your changes.
Or if you committed your changes then after the pull you should fix the conflicts if any and commit the merge with git commit

Can show me it on teamviewer, if your glad to help me ili be happy :)

Rochet2
07-17-2016, 04:30 PM
No. Someone else might, but I doubt it a bit.

Syphex
07-17-2016, 04:55 PM
Try this

git checkout HEAD^ file/to/overwrite
git pull

if that doesnt work try this;
If you want remove all local changes from your working copy, simply stash them:


git stash save --keep-index
If you don't need them anymore, you now can drop that stash:


git stash drop

Rochet2
07-17-2016, 05:05 PM
You will lose stuff you have if you do what syphex says.
So I would not suggest doing that. Unless that is what you want.

Minodevs
07-17-2016, 05:38 PM
You will lose stuff you have if you do what syphex says.
So I would not suggest doing that. Unless that is what you want.

hmm okey, That is last script and i will be done, if your glad to help me ili be happy Rotchet2, Really .. just Tell me what to do i`am,

Syphex
07-17-2016, 05:44 PM
I forgot to tell you that you should backup your stuff before executing those commands if you are afraid of losing something.

Rochet2
07-17-2016, 05:52 PM
hmm okey, That is last script and i will be done, if your glad to help me ili be happy Rotchet2, Really .. just Tell me what to do i`am,

look online how to do a git commit.
Then do it. Then pull.

Minodevs
07-17-2016, 05:59 PM
look online how to do a git commit.
Then do it. Then pull.

okey will check in to Google