also sprach David Bremner <david at 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.bogus at madduck.net -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: Digital signature (see http://martin-krafft.net/gpg/) URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20100207/c5bba3b5/attachment.pgp>
