<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-15">
</head>
<body bgcolor="#ffffff" text="#000000">
Hi!<br>
<br>
Here are the instructions to merge your GSoC branches to the Salad
branch!<br>
<br>
First of all: if you're not really familiar with subversion,
conflict fixing, etc. yet, you might leave that job to someone else!<br>
<br>
The first step when you want to merge your changes to salad is to
make sure both branches are <b>up to date with trunk</b>! You can
check this with the command<br>
<br>
<pre>svn propget svn:mergeinfo</pre>
<br>
Make sure both show the <b>same revision for trunk</b>.<br>
Then the merge should be pretty simple, in the salad checkout do the
following:<br>
<br>
<pre>svn merge ^/branches/soc-2011-yourbranchnamehere</pre>
<br>
If you experience any trouble better stay on the safe side and <b>ask
for help</b>! You can ask me, theeth (Martin Poirier) or any other
experienced developer.<br>
<br>
One last tipp: The more often you merge, the less conflicts you'll
experience!<br>
<br>
Regards<br>
<br>
</body>
</html>