Definitely commit to your feature branch. Then test that nothing is
broken. SVN can only go so far to resolve conflicts and it still takes
a real-world test to make sure the code still works as expected. My
working environment is a bit different than simple trunk and branches,
so my protocol is not the same as most svn users when bringing things
back into the "trunk." If I understand correctly, you'll just be doing
a similar merge operation only you'll be starting with the copy of your
trunk on your machine and pointing the url at the your feature branch.
Same rules apply for doing things step-by-step. Good luck.
-Tim
From: Brian T [mailto:brian.tabios_at_gmail.com]
...
What are the next steps? I suppose I should commit these changes into
the branch. Then I should set my WC to the trunk and do a merge from the
branch. Is that correct?
On Tue, Jun 7, 2011 at 2:00 PM, Brian Tabios <brian.tabios_at_gmail.com>
wrote:
I need to merge a feature branch back into the trunk. My WC copy points
to the feature branch. I haven't merged any of the trunk into my branch
yet. The documentation says that before reintegrating my branch, I
should keep the branch in sync with the trunk changes. What's option in
TortoiseSVN do I use to update my branch with the latest trunk changes?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2760204
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-06-08 06:01:47 CEST