I have a problem with git, which, it seems to me, relates to permissions. The situation is this: I have two branches: "master" and "theme". This file is called "settings.php" and it has permissions r - rw-rw-, and the registered owner is my own username. I am using Ubuntu 10.4LTS.
I create the problem as follows:
- Apply for the newsletter
- Make changes to settings.php
- Add and commit the change to 'theming'
- Mark the 'master' branch with: $ git master checkout
After the previous steps, I get the error "unable to disable settings.php", and I note that the file has also been modified in master. This also happens if I do it the other way around, i.e. I change it to the owner, record the change and checkout. Then it does not allow me to return to the previous branch, as there are changes that need to be made.
The only way I know to avoid this problem is $ sudo checkout [branchname]. This fixes the problem temporarily, but if I ever use checkout without sudo, I encounter the same thing again and I have to worry about undoing all changes in my current branch.
Does anyone know how to solve this? I looked around, and I found problems with the shutdown, but not like mine.
source
share