Dt/task/merge sample into develop

phunware / maas-mapping-android-sdk

Phunware Mapping SDK for Android

0 stars 6 forks source link

Dt/task/merge sample into develop #104

Closed dtran-phunware closed 4 years ago

dtran-phunware commented 4 years ago

Context

This was not a simple merge, there was a lot of merge conflicts. We'll need to check that nothing got deleted or is missing.

Description

Adding a SS of files that had conflicts:
@avakkachen need your expertise and help on making sure things that were in develop but not necessarily in the sample_app_updates branch were not incorrectly overridden.

npike commented 4 years ago

Thanks @dtran-phunware, pretty intense merge! Looks like a couple releases were done from develop and merged into sample_code_updates along with some other parallel work.. which created this interesting situation.

Maybe when we close out this PR we pick the Squash and merge option just to combine them down to a single commit (so commits like Prepping for 3.9.2 release don't appear twice in develop)

dtran-phunware commented 4 years ago

Looks Ok. Since it's a huge PR can we also make sure old use cases are working

Performed basic verifications of the old scenarios and sanity testing