Comment 2 for bug 1182003

I think there is nothing wrong in using shelve with files in conflict.
As for the commit action, I agree it should be disabled as long as there is at least 1 conflict in the branch. However, this means we will need to get the list of conflict on each right click and this will impact the user experience.
Maybe we can simply disable the OK button in the commit dialog? Or show a warning box informing the user about the conflicts instead?