Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
I rather agree with Mike... (see below) Mike Lehmann wrote... > > [...] it cannot > merge the change automatically, because the file > was deleted (quite the same as I would have > removed all lines from the file), it MUST produce > a conflict. [...] Bo Berglund reacted... > > There is no conflict. A conflict occurs when two > files that are being merged have *different* > changes to the same part of the file (=same line). > If the differences are on different parts of the > file the merge just combines them and the result > contains both informations. But when I remove the file, I can see it as editing of all its lines. This way, the edited regions from the branch do overlap and it should look like a conflict. In other words, whenever two people touch the same part of code, the conflict should appear. It is not the conflict from the machine point of view. Marking the conflict should visulalize the situation for people. Here one user modified a line and the other user deleted it (with the file) -- clearly a conflict from user's point of view. The file should reappear and be marked inside somehow like "one of the files was deleted". Petr -- Petr Prikryl (prikrylp at skil dot cz)