git pull warning about 2 translations when switching to master from Qt

[Amit Chaudhuri]

Henrik - thanks - rubbish lying around on my hard disk then ;)

FWIW - I'm tending to be rather more brutal about throwing things away and
Dirk showed me a nice interface for staying closer to the steady stream of
updates..


On Fri, May 10, 2013 at 8:30 AM, Henrik Brautaset Aronsen <
subsurface at henrik.synth.no> wrote:

> Amit Chaudhuri wrote:
>
>> switching from the Qt branch to master this morning - something I've not
>> done for some time - I get the following warning before git aborts.
>>
>> error: The following untracked working tree files would be overwritten
>> by merge:
>>          po/hr_HR.po
>>          po/it_IT.po
>> Please move or remove them before you can merge.
>>
>> Removing the files lets things proceed fine and the files end up in po.
>> I'm thinking this just reflects an addition to the tracking but mention
>> in case it signals a minor problem somewhere.
>>
>
> I had no such problems here, so I guess the problem was on your side only.
>  (Leftover files after a merge, or something.)
>
> Henrik
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.hohndel.org/pipermail/subsurface/attachments/20130510/e02a461b/attachment.html>