Hi Folks, First off, I love fossil, it's my new favorite toy and I'm using it on all my projects now. If I ever find time I may even try contributing to it in the future.
What I wanted to ask though is how people deal with conflicts. Currently, the behavior is that fossil overwrites files without any prompting using the "latest one wins" method. Now, latest one wins is fine, but having it obliterate hours of potential work in one swift motion is seriously uncool. So, my question is: how do other people handle this? It there some trick or flag I'm not seeing to prevent a merge from destroying my carefully crafted source code? Ideally, I'd be looking for one of about three things: 1) fossil update -y to make it prompt for for who wins. 2) fossil update makes backups (and tells you about them). 3) fossil sync -d to sync and print a diff of what might blow up. So, are these supported or do they need to be implemented? -- Zed A. Shaw http://zedshaw.com/ _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
