From: Borut R. <bor...@si...> - 2006-09-10 19:14:07
|
Maarten Brock wrote: > Developers, > > If we want to merge the common files in ASxxxx, how should one do that in subversion? I found > something about merging branches and something about moving files/directories but not how to > merge two files into one. > > Should I just move one file and delete the other? > I'm guessing that you want to merge files in as/msc51 and as/hc08 and as/z80 and move the merged file to as/common. I this case the solution you described is appropriate, but the side effect is that the history of deleted files is lost (actually it is not lost, but is not merged anyway). To minimize the loss you have to carefully select the file which will remain an will be moved. I suggest to chose the oldest file - the one containing the most of history. Borut |