We struggled with this issue for few weeks and we finally got it solved. In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges … Read more
Keeping your branch up to do date with the latest trunk check-ins is called a merge. I know merging can be a royal nightmare sometimes, but this is precisely what merging is.
We use what is called the unstable trunk development method. This was the development methodology that the creators of Subversion had in mind when they created Subversion. It’s simple and easy to implement. You do all of your development on trunk. Thus called the unstable trunk. When you get close to a release, you make … Read more
You don’t need to –relocate since the branch is within the same repository URL. Just do: svn switch https://www.example.com/svn/branches/v1p2p3
In your case: Switch the working copy to the trunk (SVN Switch) Merge the branch into the working copy (SVN Merge) Make sure everything still compiles and works Commit the working copy (the trunk) Consider killing the branch In a team environment I would suggest that you first merge the latest modifications from the trunk … Read more
I got it working by using below commands: pod repo remove trunk and then pod install or pod update
The trunk is the main line of development in a SVN repository. A branch is a side-line of development created to make larger, experimental or disrupting work without annoying users of the trunk version. Also, branches can be used to create development lines for multiple versions of the same product, like having a place to … Read more
Hmm, not sure I agree with Nick re tag being similar to a branch. A tag is just a marker Trunk would be the main body of development, originating from the start of the project until the present. Branch will be a copy of code derived from a certain point in the trunk that is … Read more