2013-08-10, 12:25
(2013-08-10, 12:00)Azake Wrote: jurial when I am git pulling it says:
error: Your local changes to the following files would be overwritten by merge:
addon.xml
Please, commit your changes or stash them before you can merge.
Aborting
I already made a new addon.xml but still saying that. I am just ignoring it. Just wanted to mention it.
Yeah, that's a git error -- nothing to do with me. Basically its because you changed a file and then I have updated that file so doing a pull would overwrite your changes - so git aborts rather than downloading changes and messing everything up. You need to stash your changes then pull in the latest.
Code:
git stash
git pull
and this will clear out the stashed changes (basically 'stash' tells git to keep a copy of your previous changes in case you wanted to revert back to them).
Code:
git stash clear