Question: I'm trying to build a link to an external website using some properties of my model class in my view page, e.g. I want it to render as something like -

< a href="http://twitter.com/home?status=Currently reading <http://www.mywebsite.com/post-id>">Twitter < /a>

where post-id would be pulled from the model (I'm using a strongly typed view model here - I can't use ViewData as there's a list of items being pulled back all of which need seperate links).

I tried doing < a href="<% model.PermaLink(); %>">, where PermaLink is just some string, however the value doesn't get picked up.

If I try < a href="<%= model.PermaLink %>">, I get an error - CS1502: The best overloaded method match for 'System.IO.TextWriter.Write(char)' has some invalid arguments

Is there any way to do this? I tried adding the runat="server" attribute, however this just linked to my local site and controller/model actions.

Answer: 
Do a merge with Tortoise, from the branch into the mainline, and unless there are conflicts (contrary changes very close to each other), it'll handle it. The repo hasn't changed yet, it's just a local merge. So now you commit the changes. Preview the commit to see what you're actually changing. If you like it, great.
Now do the same from the mainline into the branch. Now you should be in sync.
If you have conflicts, you'll have to edit the conflict (right within tortoise) to pick and choose which lines you want.
SVN will create merge conflicts which you can then resolve with a merge tool of your choice (on Windows e.g. WinMerge). It'll show you changes that were made in both files. You usually need to merge them manually (with the help of the merge tool). Once you finished merging you commit the merged files into trunk.