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
https://s32.postimg.org/5d7d2tvk5/Transmog.png
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
git checkout HEAD^ file/to/overwrite
git pull
If you don't need them anymore, you now can drop that stash:git stash save --keep-index
git stash drop
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,
look online how to do a git commit.
Then do it. Then pull.