frequently merge changes between branch and trunk?
Posted
by John
on Stack Overflow
See other posts from Stack Overflow
or by John
Published on 2010-04-28T21:44:31Z
Indexed on
2010/04/28
21:47 UTC
Read the original article
Hit count: 197
subversion
|refactoring
My team and I are using svn branches for the first time. Before, we use to work only from the trunk.
Over the past 2 weeks, we've been refactoring and developing new code against our branch. But during that time, another developer has been making bug fixes to code in the trunk and deploying it to the production server. We would like to frequently "update" our branch with changes from the trunk to make sure we get the latest fixes. But the problem is that we're making drastic changes to our branch, and many files have been renamed. I have a feeling every "update" we do on our branch that takes changes from trunk will cause a conflict, unless we some how get subversion to recognise that fileA.html in trunk is really fileB.html in branch.
Am I using subversion branches correctly? Am I using the word "update" correctly? Are frequent "updates" in branch advisable?
© Stack Overflow or respective owner