When my partner attempts to commit his update to BitBucket, he comes across the following error:

```
Repository State: Conflicts

```

The IDE does not tell us any further details about the conflicts and does not mark any issues in his code. 

What is going on and how can we fix this?