How to continually sync changes from trunk to branches?

Hi all,

After days of using SVN, we found an issue of branching. When a branch
separate from trunk after a long long time, It's difficult to merge back to
the trunk, there will be a lot of conflicts and even tree conflicts. We are
using an approach that merge changes from trunk to every branch daily. Does
this the right approach? What's the best practice for long term branching
for an easy merge in the end?

Another question, I think SVN should do better at supporting renaming
directories. I am confused why I must merge file manually when I renamed the
parent directory?

Richard Zhang

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2364451

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-23 13:49:13 CEST