[Users] ~/.claws-mail/menurc and version control

Barry Warsaw barry at python.org
Mon Jan 23 21:29:55 CET 2012


Is ~/.claws-mail/menurc written out in random (or undefined) order?

I ask because I have most of my $HOME configuration files under version
control, including many under ~/.claws-mail.  I generally just hack this file
directly when I want to make new keybindings.  I've noticed that I almost
always get conflicts on this file though, when merging changes from other
desktops.  The conflicts are always simple ordering differences; there are
never any substantial conflicts.

They're fairly easy to resolve, but kind of a PITA, so I'm asking. :)

Cheers,
-Barry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.claws-mail.org/pipermail/users/attachments/20120123/8dcbd35c/attachment.sig>


More information about the Users mailing list