os: kubuntu 10.04
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.