Svn merge from trunk to branch conflict for a file deleted in the trunk?

Since you know what you want to achieve, you may resolve the conflict in any way svn accepts (seems that svn wants you to keep the file) and then remove the file by hand if it survives.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.