Accidentally committed idea directory files into git

Question

I have accidentally committed the  idea  directory into git  This is causing conflicts everywhere else I need to checkout my repo  I was wondering how do I remove these files from the remote   I still need these files locally since the Intellij IDE needs them  I just don t want them in the remote  I have added the directory  idea  to my  gitignore and committed and pushed this file into remote  This seems to have no effect during my checkout on my other machine though  I still get the error message   error  The following untracked working tree files would be overwritten by checkout   idea  name  idea compiler xml  idea copyright profiles settings xml  idea encodings xml  idea misc xml  idea modules xml  idea scopes scope settings xml  idea uiDesigner xml  idea vcs xml  idea workspace xml

User · Accepted Answer

Add  idea directory to the list of ignored files  First  add it to  gitignore  so it is not accidentally committed by you  or someone else  again    idea   Remove it from repository  Second  remove the directory only from the repository  but do not delete it locally  To achieve that  do what is listed here      Remove a file from a Git repository without deleting it from the local filesystem   Send the change to others  Third  commit the  gitignore file and the removal of  idea from the repository  After that push it to the remote s    Summary  The full process would look like this     echo   idea   gt  gt   gitignore   git rm -r --cached  idea   git add  gitignore   git commit -m   some message stating you added  idea to ignored entries     git push    optionally you can replace last line with git push some remote  where some remote is the name of the remote you want to push to

User · Answer

You can remove it from the repo and commit the change   git rm  idea  -r --cached git add -u  idea  git commit -m  Removed the  idea folder    After that  you can push it to the remote and every checkout clone after that will be ok

User · Answer

Its better to perform this over Master branch  Edit  gitignore file  Add the below line in it       idea   Remove  idea folder from remote repo  using below command      git rm -r --cached  idea   For more info  reference  Removing Files from a Git Repository Without Actually Deleting Them  Stage  gitignore file  Using below command     git add  gitignore   Commit     git commit -m  Removed  idea folder    Push to remote     git push origin master

User · Answer

You should add a  gitignore file to your project and add   idea to it  You should add each directory   file in one line   If you have an existing  gitignore file then you should simply add a new line to the file and put   idea to the new line   After that run git rm -r --cached  idea command   If you faced an error you can run git rm -r -f --cached  idea command  After all run git add   and then git commit -m  Removed  idea directory and added a  gitignore file  and finally push the changes by running git push command

[git] Accidentally committed .idea directory files into git

Add .idea directory to the list of ignored files

Remove it from repository

Send the change to others

Summary

Examples related to git