Re: .gitignore vs untracked working file
From: Uwe Kleine-König <hidden>
Date: 2016-06-15 22:47:12
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/ |