> Hmm, we have 4 spaces everywhere else (and in Larry skin we have tabs I suppose). I'd either go for tabs or 4 spaces as well.
Agreed, I'll switch it to four spaces. > One more thing: I can already see ourselves in merging hell when we want to merge other pull requests or development branches back into master because most likely a merge attempt will result in conflicts. Yeah, that was my main concern as well. I've checked through the current PRs and it seems like none of them touch the plugins. Since I'm working on those first, that's fine - you should have a bit of time to merge those in until I'm done. If there are PRs that cannot be resolved quickly, we might have to check on them on a case-by-case basis. If it's just a couple of files, I can always roll back changes and redo them, although obviously I'd like to avoid that, if possible. As for branches - I only saw the release branches. Do you mean local dev branches? cheers, David On Thu, Aug 29, 2013 at 5:40 PM, Thomas Bruederli <[email protected]>wrote: > David Deutsch wrote: > > First pull request is up: > https://github.com/roundcube/roundcubemail/pull/109 > > Thanks! We'll read through it. > > > > There were a couple of things that might turn out to be controversial, I > > think mostly with calling on the html class - those seem to have a > tendency > > to get out of hand, so I decided to split it over multiple lines. > > > > For CSS, I went with a two spaces indent, which seems to be the most > > commonly used in the codebase. Let me know if you want four spaces > instead. > > Hmm, we have 4 spaces everywhere else (and in Larry skin we have tabs I > suppose). I'd either go for tabs or 4 spaces as well. > > One more thing: I can already see ourselves in merging hell when we want to > merge other pull requests or development branches back into master because > most likely a merge attempt will result in conflicts. Any suggestions how > that could go smooth? Maybe we should first clean up all of our pending PRs > and try to eliminate existing dev branches before the cleanup really gets > started. > > Kind regards, > Thomas > > _______________________________________________ > Roundcube Development discussion mailing list > [email protected] > http://lists.roundcube.net/mailman/listinfo/dev >
_______________________________________________ Roundcube Development discussion mailing list [email protected] http://lists.roundcube.net/mailman/listinfo/dev
