Git: merge chmod manual

Are you using git? That's nice! Did you use git in a (great) developer team? If so, you already knows what you have to do. Now, you have changed the chmod of some files, but you have to pull 'cause another developer in your team has changed the content of these files (and didn't changed the chmod). Now pull the shit and merge the f*** chmod manually!

:-)