The error message indicates that you or someone else has edited the
file. You can use
to see what the changes actually are. You should not be editing this file, however, as the recommended approach is to make a copy
of this file as
and edit that. That prevents this kind of problem when upgrading.
One way to proceed for now would be to use
git pull origin master
git stash pop
to save the changes in a special place, but remove them from your active files, then do the upgrade, then try to reapply the changes. You can leave off the last step if you just want a fresh copy of the distribution without your changes (that may depend on what you see when you do the
There is no guarantee that the
git stash pop will succeed, but it probably will. If not, you will get a merge conflict warning, and will have to edit the file by hand to remove the conflict.