error: Your local changes to '.idea/workspace.xml' would be overwritten by merge. Aborting.

os: kubuntu 10.04
PhpStorm 1.0
build PS-95.192

How do i get passed this error:
error: Your local changes to '.idea/workspace.xml' would be overwritten by merge.  Aborting.

i have the .idea/* path in my .gitignore and also added the .idea/ folder to my project ignored files at VERSION CONTROL -> IGNORED FILES.

When i go to do a merge of a feature branch back into the development branch i get this error.

Thanks

1 comment
Comment actions Permalink

if i remove the .idea/ folder from the git branch the error changes to:
error: Untracked working tree file '.idea/workspace.xml' would be overwritten by merge.  Aborting

still cant merge the 'feature' branch back into the 'develop' branch

0

Please sign in to leave a comment.