auto-merge: check in the ignore file first