Conflicting changes cannot be committed?

Question

when I want to commit to my respository I get the message:

Conflicting changes cannot be committed. Either exclude them from the commit or use the synchronize view to resolve the conflicts

There is also a little problem with syncronizing: I always get a red mark when I synchronize?

Can you help me?

Answer 1

Update (and merge changes == resolve conflicts) first, then you can commit.