I am working on a team with a lot of people who are not familiar with the concepts of version control systems and just do what seems to work through trial and error. Someone created a "branch" from the trunk, which is not connected with the chest. I guess this happened something like this:
- They created a folder in
branches . - They checked all the code from the torso somewhere on their desktop.
- They added all this code to the newly created folder, as if it were a bunch of new files.
Thus, the repository does not know that all this code is really just a copy of the trunk. When I look at the history of this branch in TortoiseSVN and uncheck the "Stop on copy / rename" checkbox, there are no changes that have a connecting line (or any other path) in the "Copy from path" column.
Then they made many changes to their "branch." Meanwhile, others made a lot of changes on the trunk. We tried to make a merge and of course it didn’t work. Because the chest and the fake branch are not interconnected.
I see only two ways to solve this problem:
- Go through the logs in the branch, look at each change made and manually apply each change to the outside line.
- Go through the logs on the trunk, look at all the changes that were made between version 540 (when the branch was created) and HEAD, and manually apply each change to the "branch".
This includes 7 revisions one way or 11 changes the other way, so none of them are so scary. But is there a way to make the repository “realize” that the branch is really connected, although it was not created correctly, so that we can use the built-in merge functions in Eclipse / TortoiseSVN?
(Perhaps you are wondering: why did your company hire these people and allow them to access the SVN repository without making sure that they know how to use it in the first place? We did not do this - this is a school assignment, which is a collaboration between two different classes - those that were in the lower class, they were given a very quick manual “review” of SVN, which actually taught them nothing. I asked everyone in the group to please PLEASE read the svn book , and I make sure that we (a little more experienced half of the team) carefully we follow the repository to ensure this will not happen again.)
source share