thanks Hugo, I found the initial capitals in another workspace :)
On Fri, Dec 20, 2013 at 3:45 PM, Hugo Trippaers <[email protected]> wrote: > Daan, > > Those files were renamed, but only the case changed. There is a git setting > that deals with case specifically. Switch that setting an try again. > > That worked for me at least. > > Cheers, > > Hugo > > Sent from my iPhone > >> On 20 dec. 2013, at 10:34, Daan Hoogland <[email protected]> wrote: >> >> fellow committers, >> >> I had the following disturbing experience: >> >> 10:12:35-daan@badjak:~/cloudstack/cloudstack (master)$ git pull >> Updating abd4a82..0182a18 >> error: The following untracked working tree files would be overwritten by >> merge: >> core/src/com/cloud/agent/api/baremetal/PrepareCreateTemplateCommand.java >> core/src/com/cloud/agent/api/storage/SsCommand.java >> >> engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStoragePool.java >> scripts/vm/hypervisor/xenserver/vhd-util >> test/src/com/cloud/test/longrun/GuestNetwork.java >> utils/src/com/cloud/utils/ssh/SshException.java >> Please move or remove them before you can merge. >> Aborting >> 10:12:50-daan@badjak:~/cloudstack/cloudstack (master)$ >> >> >> I had touched none of these files and I know only of vhd-util that it >> had been removed due to legal. >> >> To my knowledge this can only happen in a scenario where someone used >> git push --force, leading to loss of history in our common git. >> >> Does someone have a less disturbing explanation? >> >> thanks for any comments, >> Daan
