also sprach David Bremner <da...@tethera.net> [2010.02.07.1238 +1300]: > I have to say that merge conflicts are not very much fun. I tend > to do a certain amount of oh, take all the changes from the > server. I wonder if the approach that someone else mentioned of > keeping a file tags/message-id with the appropriate tags in it > might make merging less painful.
Merge conflicts at the file level are even less fun. This reminds me of my plan to introduce .gitignore.d/*: http://kerneltrap.org/mailarchive/git/2007/10/1/326425 -- martin | http://madduck.net/ | http://two.sentenc.es/ "there was silence for a moment, and then out of the scrambled mess of arthur's brain crawled some words." -- hitchhiker's guide to the galaxy spamtraps: madduck.bo...@madduck.net
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)
_______________________________________________ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
