Your local changes to the following files would be overwritten by merge:

Re: Your local changes to the following files would be overwritten by merge:

by Howard Miller -
Number of replies: 0
Picture of Core developers Picture of Documentation writers Picture of Particularly helpful Moodlers Picture of Peer reviewers Picture of Plugin developers
Anything that changes at all in the git controlled directory will result in that message.

Git won't ignore even the smallest change.