i am currently evaluating IntelliJ Idea v.11.1.2, especially the Git-VCS integration.
I try to work with git branches. I can create a branch using the little drop down at the bottem right corner (clicking on "new branch"). After the branch has been created i edited a file and switched back to the master branch using the little drop down as well.
The VCS- console states a successfull checkout of the target branch and additionally merges the edited files. And thats my problem. Why are the changes merged in the other branch? Is that a bug? Ist there any configuration option to prevent immediate merging?
I dont want the files get merged when switching the branches.
Has anyone experiencd the same behaviour and found a solution to this?