When pulling in changes from M2 into M1, I needed to do some hand-picking of code fragments. In the process we lost some original commit history, replaced by consolidated commits with issue ISIS-1871 [1].
Instead of re-basing our latest M2 on top of the newly assembled M1, I branched off on M1 fresh and cherry-picked commits only related to the transition to DN-5. The new branch for M2 is 'dev/2.0.0-M2-cherrypicked', which may be renamed to its original after review. Cheers, Andi [1] https://issues.apache.org/jira/browse/ISIS-1871 On 23.02.2018 10:03, Andi Huber wrote: > I'm in the process of rebasing M2 on top of M1 (master) again, but > before I do that, I'm pulling changes, that do not conflict with DN-4, > from M2 into M1. > > Remember: > > * 2.0.0-M1 is a transition to JDK 8 > * 2.0.0-M2 is a transition to Datanucleus 5 > > Cheers, > Andi >
