Home/ Questions/Q 8157451
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-06T17:17:21+00:00

We crated two branches from the trunk (using TortoiseSVN) … branch USER and branch

  • 0

We crated two branches from the trunk (using TortoiseSVN) … branch USER and branch PRODUCT

In branch PRODUCT we are working on some new features. (day 1)
In branch USER we correct bug/error as reported by customer. (day 2)

Within a few days, we fixed branch USER and merged back into trunk (day 4)
tested and merged to trunk and made live

Within a few weeks, we finished PRODUCT features and merged back into trunk. (day 10)
We received several conflicted files.

After several hours of trying to fix the errors, I completely messed up the trunk.
We had to re-do coding and kill SVN and re-create the repository.

Very frustrationing .. and we lost a lot of time.

Is there instructions on ‘re-reintegration’ or ‘updating’ a BRANCH from TRUNK?

Honestly, I dont even know the write questions to ask, as I dont know what process
we needed to perform!

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    After some playing around and getting some reading/asking questions, there is the process I used:

    1. Start development in your Trunk.

    2. You have reached a stage where you want to branch out and start a different development over the branch. You always branch out from the Trunk.

    3. Lets consider an example, we create two branches Users and Products, both from the Trunk.

    4. Simultaneous development happen on both the branches Users and Products.

    5. Now there comes a stage when development on the branch Users is done. So you re-integrate the branch Users back to Trunk. Testing happens on Trunk and for deployment you use the code in the Trunk.

    6. At this stage Users branch is re-integrated with the Trunk, but still Products branch is as it is.

    7. Users code has been re-integrated with the Trunk and deployed successfully. So now the Trunk has the Users code also. So this code should be merged with the Products branch.

    8. Now the Products branch has the Users code plus the changes that were worked upon in the Products branch itself.

    9. Once the development in the Products branch is done, it can be re-integrated with the Trunk.

    10. Now the Trunk has the code from Products branch and the Trunk is up to date and ready to be deployed to the live server.

    I hope this helps others.

    • 0