On Wed, Aug 12, 2020 at 10:56 PM Viktor <viktor.hozhyi@xxxxxxxxx> wrote: > > Hi, > > > > I’m not sure whether this behavior is on Windows only, so it’s up to you guys. > > > > Repro steps: > > 1. Having branch (let say) develop with empty working tree and empty repository – create 2 more branches (‘foo’ and ‘bar’) > > 2. Commit file ‘Test.txt’ with content ‘Test’ to ‘foo’ branch > > 3. Switch to ‘bar’ branch and commit file ‘test.txt’ with content ‘test’ (pay attention lower-case) > > 4. Merge ‘foo’ to develop > > 5. Merge ‘bar’ to develop > > After it when you switch to develop – you always will have ‘local changes’. You can perform stash, hard reset, commit – you always will have local changes (and many following errors on other git operations due to local changes). > > Reason – we have different files in Git DB (‘Test.txt’ and ‘test.txt’), but when git restores them onto Windows file system – it just will rewrite 1 file with another, because for Windows file system – it is 2 equal names. > > > > Best regards, > > Viktor Hozhyi > > Skype: vitia444 > > Phone (Telegram): +38 067 276 29 85 > > -- Best regards, Viktor Hozhyi Skype: vitia444 Phone (Telegram): +38 067 276 29 85
