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

[Henrik Brautaset Aronsen]

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