Attempting to resolve inconsistencies across commits due to ill-formatted .gitignore