naderman wrote:Rebase onto latet develop and send a WIP pull request to track it properly from now on?
I could not rebase it onto develop but I did manage to solve all conflicts (see the history in my branch and earlier posts here). What I would do is take the last commit on AJD's branch and cherry-pick that on top of my branch, and then pull request the result if it's done.
I think our time will be better spent attending the other patches in progress/pull requests than getting this one properly rebased on develop, that said the history in this patch is kind of a mess.
(Note that last I checked the patch does merge into the current develop cleanly.)