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
I'm making this an issue because it's not going to be an automatic process. I've done some experimentation and concluded that we will need to select changes manually and do them through PRs. That's because some we want to keep changes in dev-4.0 in some cases but overwrite them in other cases, where improved code has been added to the main branch. Essentially, I'm afraid we have kept the branches separate for too long.
Here is a list of outstanding changes generated by the command git cherry -v main dev-4.0:
The following issues were closed upon merging to dev-4.0. I have re-opened them. Once they are done, the commits listed above should be re-checked to see if we need additional issues or PRs.
All sub-issues are ready to merge once 3.15 is released. I'll do PRs for each of them one at a time in the order listed, since they build on one another.
I'm making this an issue because it's not going to be an automatic process. I've done some experimentation and concluded that we will need to select changes manually and do them through PRs. That's because some we want to keep changes in dev-4.0 in some cases but overwrite them in other cases, where improved code has been added to the main branch. Essentially, I'm afraid we have kept the branches separate for too long.
Here is a list of outstanding changes generated by the command
git cherry -v main dev-4.0
:More detailed info is available using
git rev-list dev-4.0 --not main -v
I'll use the above info to create individual tasks under this epic, many of which will be breaking changes.
The text was updated successfully, but these errors were encountered: