innovationcreation

I use (on Mac) opendiff * In terminal type opendiff file1 file2 * This will graphically display differences. * I create a new note, copy in the one I think is more up to date. * Using the visual opendiff info, I copy/edit the parts that are out of synch. * I archive the two conflicting notes and move on. I only do this with text only notes. Using opendiff require you to manage your notes a bit more than I think you should. Why I get conflicts is because I was editing the same note on two different computers and that is a behavior I have to be wary of:)