Thanks.
We have a release-1.0 branch which we are continually doing minor
changes to though. Once done we tag this branch as release 1.0.1,
1.0.2 etc.
But all changes are done on release 1.0 branch. How do we merge those
changes to the trunk?
The trunk is being used for a major change to the apps. (Using an
Oracle DB rather than Informix) and some other major new
functionality.
We cannot delete the branch, as this is our baseline to what is being
used by our customer.
Our process works fine. I dont see why you have to select the
conflict option from the the release version though to stop it trying
to reintegrate the same file.
On Feb 20, 4:20 pm, Bob Archer <bob.arc..._at_amsi.com> wrote:
> > When a change is made to the release branch we merge in the changes
> > from the release to the trunk. In many cases the code on the trunk has
> > changed sufficiently to cause a conflict. When we resolve the
> > conflict (using the "edit conflicts" option and then saving) and
> > commit, everything seems fine. However, when we come to reintegrate
>
> If you are merging from the release branch into trunk, you shouldn't
> then do a reintegrate, as there is nothing to reintegrate.
>
> Reintegrate is generally for a feature branch which you are merging to
> from trunk. Once the feature is done you reintegrate that branch to
> trunk and delete the branch.
>
> BOb
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1199527
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-20 18:23:22 CET