datetime_helper | useful utilities for Ruby projects | Application Framework library

Git has this unique feature where you assemble the content of the commit incrementally. Unfortunately they couldn't even agree on a name, so it is referred to alternately as ‘stage’, ‘index’ and ‘cache’. That's where files are added with the git add command.

The IDEA Git plugin is trying to hide it from you, because it adds complexity, and because the UI, designed originally for other version control systems, does not have a good way to show it. But your working directory is in a state that requires you to deal with it.

The standard Git GUI (just run git gui in your work tree from the command-line) is quite good way to access all the features of the commit creation, or you can use one of the other GUIs that have the corresponding dialog (e.g. git extensions). If my memory serves me well the IDEA plugin does not have it though, so you'll need something beyond that.

Now what is your problem: It seems you've added the images to commit, and when Git complained about conflict in them on pull, just removed them from disk. But as they were already “added to version control”, that is ‘staged’ in Git lingo, Git still remembers them and has even bigger problem with them now. You can either

• Open the git gui and chase them away from the lower left window by clicking on the icons (files are staged and unstaged in Git GUI by clicking on their icons, while clicking on their names shows the changes (for text files); it is quick and simple, but not discoverable at all).
• From command-line do git reset HEAD design/img/interesses/neigborhood/ (as the status output suggests in attempt for being helpful, which fails due to the unfamiliar term ‘unstage’)

You have one more file staged, application/helpers/datetime_helper.php, so you have to commit it (or reset like the icons if that's not what you meant) before doing pull, because Git refuses to merge when there are local changes. That is actually important safety feature, since you can abort and retry the merge if you make a mistake in it that way. You probably have to pull before you push too, because there are other changes in the main repository.