Error on pull from git

[achartier]

I am trying to update my local repository form the current fabrik master but am getting this error:

error: The following untracked working tree files would be overwritten by merge:
plugins/fabrik_element/colourpicker/layouts/fabrik-element-colourpicker-list.php

Any ideas what could be causing this?

 

[felixkat]

Usually happens if you've made some changes to a file that haven't been commited. If you don't use that element then just remove it from your git directory and it should populate again with the next pull.

 

[cheesegrits]

Did you do a J! upgrade to 3.4.2?

That would have added that file, which was only added to git about 10 days ago. Then when you try and merge git, it gets confused because it isn't tracking that file.

Just delete it and pull again.

-- hugh

 

[achartier]

Thank you both, that did it.