Re: renaming a file on the main trunk, development on a branch goes a head on the old filename, merging the changes

I'm no CVS expert, but in my thinking, the easiest thing to do would be to merge the branch into the trunk at the last point before the files where renamed. Then rename the files and split off a new branch. If you've already renamed the files on the trunk, I'd still do the same thing: 1) Re

Re: renaming a file on the main trunk, development on a branch goes a head on the old filename, merging the changes

I'm no CVS expert, but in my thinking, the easiest thing to do would be to merge the branch into the trunk at the last point before the files where renamed. Then rename the files and split off a new branch. If you've already renamed the files on the trunk, I'd still do the same thing: 1) Re