Report question

Question: SVN - unable to merge branch back into trunk - numerous tree-conflicts