After custom Patches no git pull possible..

[iRelax]

Hey guys, i noticed anytime if i modify my core with some edit's i cant run git pull? anytime same messages

"cannot merge player.cpp not up to date" etc.. thats piss me off anytime when mangos did some edit's i have to rewrite my patches.. any way to trigger my problem? or exist a git command to ignore my edit's?

Sorry for bad english, its late i'm tired..

[Slurm]

Try using "git commit" to commit your changes to your local repository before merging. It looks like your files are not in the local repository. You may or may not need to resolve conflicts with merging at this point. If you're familiar with SVN I suggest you check out this git crash course.

[Schmoozerd]

1) do not work in master, have a clean master, do

checkout -b myFancyBranch

2) work there, commit your changes

if you want to update

git checkout master

git pull

git checkout myFancyBranch

git merge master