What's the best practice of such merge situation?

I have a MFC dialog project in the trunk and a branch, the branch implement
some features to fulfill a client's unique request.
In the branch I edit so many in resource design. Now I add a paramount
function to the branch, both edit the dialog resource and code. I need to
integrate this change to trunk also, I found merge the resource file now is
a disaster. I had to repeate the UI change again manually.
According your experience, what's the best design or practice in such
situation?
Hope I express it clearly!

-- 
View this message in context: http://old.nabble.com/What%27s-the-best-practice-of-such-merge-situation--tp29235194p29235194.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2636857
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].