Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Fix Merge Issue In nativeUpdateMarker #5303

Closed
bleege opened this issue Jun 9, 2016 · 2 comments
Closed

Fix Merge Issue In nativeUpdateMarker #5303

bleege opened this issue Jun 9, 2016 · 2 comments
Assignees
@bleege
Labels
Android Mapbox Maps SDK for Android
Milestone
android-v4.1.0

Comments

@bleege
Copy link
Contributor

bleege commented Jun 9, 2016

During the merging of release-android-v4.1.0 back into master after Beta 2 shipped ( PR #5291 ) part of the code from #5076 got overridden and needs to be returned. Specifically, jni.cpp had changed in nativeUpdateMarker in both branches which led to the confusion.

/cc @jfirebaugh @tobrun
@bleege bleege added the Android Mapbox Maps SDK for Android label Jun 9, 2016
@bleege bleege added this to the android-v4.1.0 milestone Jun 9, 2016
@bleege bleege self-assigned this Jun 9, 2016
bleege added a commit that referenced this issue Jun 9, 2016
@bleege
[android] #5303 - Updating code to take properly merge what each bran…
ad916f1 
…ch intended for nativeUpdateMarker
@bleege bleege mentioned this issue Jun 9, 2016
Closed
bleege added a commit that referenced this issue Jun 9, 2016
@bleege
[android] #5303 - Updating code to take properly merge what each bran…
511801c 
…ch intended for nativeUpdateMarker
@bleege
Copy link
Contributor Author

bleege commented Jun 9, 2016

Rebased and Merged!

@bleege bleege closed this as completed Jun 9, 2016
@bleege bleege mentioned this issue Jun 9, 2016
Closed
@jfirebaugh
Copy link
Contributor

👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@bleege bleege

Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Milestone
android-v4.1.0
Development

No branches or pull requests
2 participants
@jfirebaugh @bleege