Using a command line version of SVN (SlikSvn), I have a branch Ive been working on for a while, and merged it into trunk as I thought I had finished with that branch.
But now, Ive done more work on the branch, and committed a number of new revisions (to the branch).
The trunk has not had any modifications since the branch was merged.
What I want to do now, is get my recent branch changes into trunk, and Im unsure if I should merge from the revision number where this branch started again, or from the revision where I last merged, or the one after… or maybe something else.
Very many thanks.
Just go into trunk working copy do
that’s it.
Or in TortoiseSVN default merge revision range.