Avoid committing the # tempfiles or saving them in a separate directory generally solves this problem.