On Mon, Nov 28, 2011 at 4:43 AM, jes Struck <j...@praqma.net> wrote:
>
> no what i wanted to do was
>
> https://sites.google.com/a/praqma.net/howto/subversion/branching-strategies
>
> im pretty sure this would solve my issues.
>
>
The relevant thing there is the merge from trunk to branch, which you'll
likely want to do often so your developers can take advantage of each
others' work and avoid large conflicts. You might also consider more of a
feature-branch approach, just copying a new branch from the trunk to start
the next round of work after you reintegrate the current work. This will
work even if only one developer uses the branch. If you don't like the
clutter from a lot of branch names, you could delete the finished work and
copy back to the same name.
--
Les Mikesell
lesmikes...@gmail.com
