Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main to release-v2.0 #2850

Closed
1ec5 opened this issue Mar 5, 2021 · 4 comments · Fixed by #2995
Closed

Merge main to release-v2.0 #2850

1ec5 opened this issue Mar 5, 2021 · 4 comments · Fixed by #2995
Assignees
@MaximAlien @avi-c
Milestone
v2.0.0 (RC)

Comments

@1ec5
Copy link
Contributor

1ec5 commented Mar 5, 2021

main has diverged from the point at which release-v2.0 branched. To avoid regressions from v1.3.0 to v2.0.0, we need to merge main to release-v2.0. The main source of conflicts will be #2734, once it lands.

/cc @mapbox/navigation-ios @avi-c
@1ec5 1ec5 added the - chore label Mar 5, 2021
@1ec5 1ec5 added this to the v2.0.0 (Public Preview) milestone Mar 5, 2021
@1ec5
Copy link
Contributor Author

1ec5 commented Mar 8, 2021

The main source of conflicts will be #2734, once it lands.

If porting #2734 to the map SDK v10 runtime styling API turns out to be nontrivial, we can merge an earlier commit of main to release-v2.0 as a stopgap.

@1ec5
Copy link
Contributor Author

1ec5 commented Mar 8, 2021

#2853 takes care of the merge except for the changes in #2734.

@truburt truburt added wip and removed wip labels Apr 2, 2021
@MaximAlien
Copy link
Contributor

PR with merge can be found in #2995.

@MaximAlien MaximAlien self-assigned this May 12, 2021
@MaximAlien MaximAlien mentioned this issue May 12, 2021
Merged
@MaximAlien MaximAlien linked a pull request May 12, 2021 that will close this issue
Catch-up with main. #2995
Merged
@1ec5
Copy link
Contributor Author

1ec5 commented May 13, 2021

Fixed in #2995.

@1ec5 1ec5 closed this as completed May 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@MaximAlien MaximAlien

@avi-c avi-c

Labels
None yet
Projects
None yet
Milestone
v2.0.0 (RC)
Development

Successfully merging a pull request may close this issue.

Catch-up with main. mapbox/mapbox-navigation-ios
4 participants
@1ec5 @MaximAlien @truburt @avi-c