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.
Hi, I create a branch-tag for a file. Then I remove (and commit) it on the main trunk. Now I checkout the branch, modify the file and commit the changes. When merging the changes of the branch into the main trunk, no conflict occurs, although it is expected. The described situation happens, when we actually move files in the main trunk (larger refactoring), but want to get conflict, that need to be solve manually in the moved file. --Mike