Code review comment for lp://staging/~widelands-dev/widelands/gci18nfixes

Do you have any ideas how to get rid of the added/removed/deleted conflicts?

I did a full manual merge and now bzr wants to track something somewhere and is generating these conflicts.

I tried saving my work, doing a bzr merge and then copying my files over, but then I get the same conflicts directly in the branch.

I tried stuff like deleting the test and po directories and copying them over from trunk, how to I tell bzr to shut up and accept the changes already?