On Tuesday, 21 May 2013 14:39:36 CEST, Francesco Riosa wrote:
I'm no expert in git merges, I do use it mainly as a filesystem with a memory, if you need a more reliable merge I volunteer for that but suggest to suggest me the appropriate procedure and traps to be encountered.
Understood. I think it is important that what ends up in the repo has a reasonably clear history, though -- if only to make our life easier later on when we need to bisect. I'll prepare a new branch, hopefully in a few weeks. If you'd like to work on the GUI for the settings dialog in the meanwhile, that would be terrific. Cheers, Jan -- Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/
