Hi all, (just sending this email as we discussed about this topic at the meeting, without any decision)
There is a bunch of "approved" pull requests which are falling into "conflict mode" due to minor changes appeared in recent commits https://github.com/apache/bookkeeper/pull/127 BOOKKEEPER-1028 and BOOKKEEPER-1029 from Charan https://github.com/apache/bookkeeper/pull/189 BOOKKEEPER-1033: Handle DirsPartitionDuplication from Charan https://github.com/apache/bookkeeper/pull/81 BOOKKEEPER-753: Bookie should run garbage collection before startup when all directories became full from Sijie there are some other big changes, like the SSL support which will need a new rebase this is the full list or PRs: https://github.com/apache/bookkeeper/pulls Do we need a "strategy" in order to minimize the "resolve conflicts" effort ? -- Enrico
