You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Risk of master/develop conflicts because of back ports (only risk here is missing changes in develop that are in master, we can fix the merging with git merge --ours)
TODO
Port back map matching parameter fix
Port back Disney Land fix (both the error handling and the pre-processing)
Port back trip plugin error
Port back datastore fix (not sure if the change will be too big)
Incremental merge
Aim for maximum of stability to make 4.9.1 an option we can support for a while.
Just merge develop into master
Will include a lot of fixes but also a lot of the restructuring we have begun for 5.0.
Might need changes in node-osrm due to changed buildsystem structure
Higher risk of running this out in a short amount of time
@TheMarex are the changes keeping apis stable? do you think the restructuring towards 5.0 is stable (not reverted soon again)? If both is true, than the incremental merge sounds like the better option, with 4.9.1 landing early next week?
@freenerd we have had the following breaking changes in develop:
removing GPX support (was never exposed in node-osrm)
breaking C++ API for libosrm (added namespaces and renamed library)
Most likely that won't affect a lot of people but nothing for a .1 release I think. We will have this problem down the road anyway, if we merge the API redux we can't use devlop -> master merges for 4.9.2 anymore.
I see release options:
Small fix
develop
that are inmaster
, we can fix the merging withgit merge --ours
)TODO
Incremental merge
4.9.1
an option we can support for a while.develop
intomaster
5.0
.node-osrm
due to changed buildsystem structureTODO
Currently I am leaning towards the small fix in
4.9.1
./cc @freenerd @daniel-j-h @danpat @MoKob
The text was updated successfully, but these errors were encountered: