you shouldnt have to do the changes everytiem if you make your own local repository and do a
Code:
git pull https://github.com/EQEMU/Server
from a git enabled command prompt spawned by the git gui client
if there is a conflict due to a recent change - it will complain and you can sort it out right there.