Remove all deleted files: ( during merge conflict when both repos deleted them ) git ls-files –deleted -z | xargs -0 git rm