2

I have a problem. Normally I work using Tortoise SVN and every month to work on the development of the code I use a branch structure that looks like this:

trunk ----- b1
|           |
| --------->|
|           |----- b2
|           |       |
| --------->|       |
| <----[1]--|       |
|           X       |
| -----[2]--------> |
|                   |
|                   |

After the step [1] (reintegration branch to trunk), I remove unnecessary branch b1. Then I try to merge the changes from the current trunk to b2. Unfortunately, when you try to merge the trunk version [2], which was established after the integration of trees get a lot of conflicts. What is the reason and what should be the correct order when you try to create a new branch from the branch, not the trunk?

Leonel Sanches da Silva
  • 6,972
  • 9
  • 46
  • 66
Emil J
  • 215
  • 2
  • 4
  • 20
  • It's so necessary delete the first branch? Why? I see no good reason to generate a second branch from a deleted branch. – Leonel Sanches da Silva Apr 18 '13 at 14:26
  • In accordance with the user's SVN, do not work on a branch after reintegration into her trunk. Sometimes before reintegration begins to create additional functionality that bid farewell merged to trunk, some time after [1]. They should develop the functionality currently contained in b1. So I create a branch from a branch b1 – Emil J Jun 18 '13 at 12:10
  • This approach is incorrect. After integrated, the branch should never be integrated again. The correct is create another branch from a trunk revision. That's an issue in your process. – Leonel Sanches da Silva Jun 18 '13 at 19:03

0 Answers0