Hello, > $ git checkout master > error: Untracked working tree file 'Project/bin/path/file.jjt' would > be overwritten by merge. What is the output of $ git ls-files master bin/ ? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html