We're also reusing native code implementation from rockwork mostly, of course we have own platfrom layer in main.cpp but the rest is mostly as-is. We can rename main.cpp to rockpool.cpp to avoid conflicts and then keep rest of the code shared.
Our QML part is also independent now since we've moved it to sailfish-specific dirs (pages/covers).
It's a pity we don't have track log for bazaar - so we cannot say what actually changed since initial import. And unfortunately during the initial import you didn't preserve original state so we also don't have a track of how far we deviated from them during the import.
From what I can see we have only servicecontrol.cpp, pebble.cpp and main.cpp (of course) changed since initial import.
These are topics to settle down if we targeting the merge though.