{"thread":{"id":"8017","subject":"Checkout fails when one branch contains a directory with the name of a file in the other branch","startedAt":"2007-05-07T11:07:56Z","lastAt":"2007-05-07T13:00:57Z","messageCount":4,"participants":["Tom Koelman","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"41321","messageId":"ubqgw51tf.fsf@assurancetourix.xs4all.nl","threadId":"8017","inReplyTo":null,"subject":"Checkout fails when one branch contains a directory with the name of a file in the other branch","fromName":"Tom Koelman","fromEmail":"tkoelman@xs4all.nl","sentAt":"2007-05-07T11:07:56Z","receivedAt":"2007-05-07T11:07:56Z","isPatch":false,"sender":{"key":"tkoelman@xs4all.nl","avatar":null},"body":"\nHi,\n\nI am not sure whether this is intentional or not. I am wondering why\nthis scenario fails, and if it is by design, how I should handle this\nsituation:\n\n--------------------------------------------------------------------------------\n$ mkdir test\n\n$ cd test\n\n$ git init\nInitialized empty Git repository in .git/\n\n$ echo aFile > aFile\n\n$ git add aFile\n\n$ git commit -m \"initial\"\nCreated initial commit a4aa48bb4ca57699341e380b17a1c3d92e44d08b\n 1 files changed, 1 insertions(+), 0 deletions(-)\n create mode 100644 aFile\n\n$ git checkout -b branch\nSwitched to a new branch \"branch\"\n\n$ git rm aFile\nrm 'aFile'\n\n$ git commit -m \"No aFile file anymore\"\n\nCreated commit 6ac689ae4d7e8c0d82526d84563c12109b6cd900\n 1 files changed, 0 insertions(+), 1 deletions(-)\n delete mode 100644 jacob\n\n$ mkdir aFile\n\n$ touch aFile/anotherFile\n\n$ git add aFile/anotherFile \n\n$ git commit -m \"added aFile directory\"\nCreated commit 634e5fff2fdb6365d4be5b2dca29e9c78164cb07\n 0 files changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 aFile/anotherFile\n\n$ git checkout master\nfatal: Untracked working tree file 'aFile' would be overwritten by merge.\n--------------------------------------------------------------------------------\n\nRegards,\nTom Koelman\n"},{"id":"41323","messageId":"Pine.LNX.4.64.0705071329170.4167@racer.site","threadId":"8017","inReplyTo":"ubqgw51tf.fsf@assurancetourix.xs4all.nl","subject":"Re: Checkout fails when one branch contains a directory with the name of a file in the other branch","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-05-07T11:31:16Z","receivedAt":"2007-05-07T11:31:16Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 7 May 2007, Tom Koelman wrote:\n\n> I am not sure whether this is intentional or not. I am wondering why\n> this scenario fails, and if it is by design, how I should handle this\n> situation:\n>\n> [...]\n> \n> $ git checkout master\n> fatal: Untracked working tree file 'aFile' would be overwritten by merge.\n\nI tried to reproduce this behaviour, but it worked here. What Git version \ndo you use? Mine says \"git version 1.5.2.rc2.2435.ge5a9b\".\n\nHth,\nDscho\n"},{"id":"41324","messageId":"463F0E5E.6000204@xs4all.nl","threadId":"8017","inReplyTo":"Pine.LNX.4.64.0705071329170.4167@racer.site","subject":"Re: Checkout fails when one branch contains a directory with the name of a file in the other branch","fromName":"Tom Koelman","fromEmail":"tkoelman@xs4all.nl","sentAt":"2007-05-07T11:32:46Z","receivedAt":"2007-05-07T11:32:46Z","isPatch":false,"sender":{"key":"tkoelman@xs4all.nl","avatar":null},"body":"Johannes Schindelin wrote:\n> Hi,\n> \n> On Mon, 7 May 2007, Tom Koelman wrote:\n> \n>> I am not sure whether this is intentional or not. I am wondering why\n>> this scenario fails, and if it is by design, how I should handle this\n>> situation:\n>>\n>> [...]\n>>\n>> $ git checkout master\n>> fatal: Untracked working tree file 'aFile' would be overwritten by merge.\n> \n> I tried to reproduce this behaviour, but it worked here. What Git version \n> do you use? Mine says \"git version 1.5.2.rc2.2435.ge5a9b\".\n> \n> Hth,\n> Dscho\n\nI tried 1.5.1.3 under cygwin and 1.5.0.6 under Linux FC5.\n\nRegards,\nTom Koelman\n"},{"id":"41337","messageId":"Pine.LNX.4.64.0705071500210.4167@racer.site","threadId":"8017","inReplyTo":"463F0E5E.6000204@xs4all.nl","subject":"Re: Checkout fails when one branch contains a directory with the name of a file in the other branch","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-05-07T13:00:57Z","receivedAt":"2007-05-07T13:00:57Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 7 May 2007, Tom Koelman wrote:\n\n> Johannes Schindelin wrote:\n> \n> > On Mon, 7 May 2007, Tom Koelman wrote:\n> > \n> > > I am not sure whether this is intentional or not. I am wondering why\n> > > this scenario fails, and if it is by design, how I should handle this\n> > > situation:\n> > > \n> > > [...]\n> > > \n> > > $ git checkout master\n> > > fatal: Untracked working tree file 'aFile' would be overwritten by merge.\n> > \n> > I tried to reproduce this behaviour, but it worked here. What Git version\n> > do you use? Mine says \"git version 1.5.2.rc2.2435.ge5a9b\".\n> > \n> > Hth,\n> > Dscho\n> \n> I tried 1.5.1.3 under cygwin and 1.5.0.6 under Linux FC5.\n\nI can confirm that it reproduces with 1.5.1.3. So, it has been fixed in \n1.5.2.rc2.\n\nCiao,\nDscho\n"}]}