On Sun, Dec 12, 2010 at 06:57:56PM -0500, Richard Hipp wrote: > Suppose you have the "trunk" branch checked out and you have made changes to > file xyz.txt locally, but have not checked them in. Then you do a merge of > branch "other-branch": > > fossil merge other-branch > > The file xyz.txt has been deleted in other-branch. What should fossil's > response be? Should it retain the locally edited copy of xyz.txt, or should > it delete file xyz.txt?
Consider it a merge conflict. Joerg _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
