I suspect you've tried to commit file or subdir after merge? Is it correct assumption? Try to commit entire tree.
I suspect you've tried to commit file or subdir after merge? Is it correct assumption? Try to commit entire tree.