Hi, On Mon, 7 May 2007, Tom Koelman wrote: > I am not sure whether this is intentional or not. I am wondering why > this scenario fails, and if it is by design, how I should handle this > situation: > > [...] > > $ git checkout master > fatal: Untracked working tree file 'aFile' would be overwritten by merge. I tried to reproduce this behaviour, but it worked here. What Git version do you use? Mine says "git version 1.5.2.rc2.2435.ge5a9b". Hth, Dscho - 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