[Soc-2011-dev] Merging into Salad

[neXyon]

Hi!

Here are the instructions to merge your GSoC branches to the Salad branch!

First of all: if you're not really familiar with subversion, conflict 
fixing, etc. yet, you might leave that job to someone else!

The first step when you want to merge your changes to salad is to make 
sure both branches are *up to date with trunk*! You can check this with 
the command

svn propget svn:mergeinfo


Make sure both show the *same revision for trunk*.
Then the merge should be pretty simple, in the salad checkout do the 
following:

svn merge ^/branches/soc-2011-yourbranchnamehere


If you experience any trouble better stay on the safe side and *ask for 
help*! You can ask me, theeth (Martin Poirier) or any other experienced 
developer.

One last tipp: The more often you merge, the less conflicts you'll 
experience!

Regards

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2011-dev/attachments/20110604/feb03e6a/attachment.htm