If I have local changes that I haven't checked in, and the merge would conflict with those changes, including by deleting my file, fossil should say something like:
Hey, this merge will conflict with your uncommitted changes to: * File X * File Y Commit your changes or use --force to merge anyway. It's nice that `fossil undo` can back out a merge, but if I accidentally clobber some of my work with a merge, it's entirely possible I won't notice until it's too late to use undo. (E.g., much of my work is in PHP, where even syntax errors or missing 'require'd files won't be apparent until I actually try to use the page that the error is on.) It would be nice to have something like `git stash`, too. Probably the biggest thing I miss from git. -- Joshua Paine LetterBlock: Web applications built with joy http://letterblock.com/ 301-576-1920 _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
