Switching branches with IntelliJ & Git

Question

this should be an easy one...

I'm trying IntelliJ (came from Eclipse) and I have this issue that I don't know how to handle, I have configured my project using the branchA no problems, but, as soon a try to checkout another branch branchB the IDE tells me that fails due some untracked file that will get overwrite.

The file is vcs.xml :S

If I delete it as the IDE recommends I lose the ability to switch branches.

I'm not sure what I'm missing or how do I have to configure the project so I can switch branches normally.

Any help will be appreciated, thanks.

Answer 1

Looks like you need to do two things

1) remove .idea/vcs.xml file from your Git repository

2) exclude it in .gitignore so you will not check this file in anymore. It is usually stored under /.idea/. This particular one can be done with

 .idea / vcs.xml

You should not check this file inside Git repository as the others suggest. Otherwise another IntelliJ user of the Git repo will overwrite his settings of vcs.

Answer 2

You can go on VCS > Git > Commit. There you can toggle the unversioned file and toggle the checkbox, commit and your file is in the vcs.

Answer 3

You need to add the untracked branch to git. From the command line it would be:

git add <file name>
git commit -m "Your message here"

In the IDE, find the file in the project tree-view, right-click, and select Git -> Add (or press Ctrl-Alt-A). Then to commit, Ctrl-K.