This backporting has mostly be done by cherry-picking commits one-by-one rather than a large rebase. In particularly we wanted to get to the point of having the "needs review" feed in the master branch of mySociety's version of the codebase, so that we can use it for Kenya.
There is still a significant number of useful changes from the DC fork that we would like to bring over (especially the migrations relating to post locking) but this is a good start, and helps the Kenyan project by adding new features (like the "needs review" feed) that hopefully they will find useful.
This backporting has mostly be done by cherry-picking commits one-by-one rather than a large rebase. In particularly we wanted to get to the point of having the "needs review" feed in the master branch of mySociety's version of the codebase, so that we can use it for Kenya.
There is still a significant number of useful changes from the DC fork that we would like to bring over (especially the migrations relating to post locking) but this is a good start, and helps the Kenyan project by adding new features (like the "needs review" feed) that hopefully they will find useful.