git大小写敏感, macOS大小写不敏感导致的问题

git大小写敏感, macOS大小写不敏感导致git一直提示有改动，但是又没办法commit成功。

>原因:

同个目录下出现2个文件, 由2个同事分别创建

PagDAO.java

PagDao.java

>解决: 直接改名

mv PagDAO.java PagDAO111.java

此时git认为删除了PagDAO.java和PagDao.java

如下:

striker$ mv src/main/java/xxx/PayDAO.java src/main/java/xxx/PayDAO111.java

striker$ git st

On branch lwl

Your branch is up-to-date with 'origin/lwl'.

Changes not staged for commit:

  (use "git add/rm <file>..." to update what will be committed)

  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    src/main/java/xxx/PayDAO.java

    deleted:    src/main/java/xxx/PayDao.java

Untracked files:

  (use "git add <file>..." to include in what will be committed)

    src/main/java/xxx/PayDAO111.java

这时提交改动。

然后再把PayDAO111.java重命名为PayDAO.java即可