[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

just upgraded to svn 1.5 - confused

From: Totte Karlsson <tottek_at_gmail.com>
Date: Thu, 28 Apr 2011 17:27:36 -0700

Someone said that merges are easy.. I have read the svn book about merges but it
does not help.

I create a branch and I can keep it synchronized with the trunk.
I can even re-integrate the branch with the trunk.

 From now on, it seems the branch is useless since I can't continue working on
it and re-sync with the trunk without getting absolutely nonsense conflicts.. :)

What is the proper, if any, philosophy here? Shall one create a new branch each
time it is re integrated with the trunk?

Any hints helpful...!
Received on 2011-04-29 02:28:09 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.