GIT: Permission error in git merge

Question

Utilizo Ubuntu.

A strange thing happens. I have the main project in the master branch and made a new branch for changes and tests. When I create new files in this new branch everything is ok, no permissions problems or anything.

Checking and everything being ok I go back to the master and do a git merge. Here comes the problem, all the files that are "brought" by the merge come without permission for modification. Then I have to get into the terminal and fix the permissions.

Is that normal? There’s no way to come with the right permissions?

Personal thank you.

Answer 1

This is because in fact the files have the wrong permissions on some of the branches. Leave the permissions equal, commit and try the merge again.

There’s also how to make Git ignore file mode, but not recommend it. Just run git config core.fileMode false.