Draft: Testing master -> zoom merge
Just a test to see the diff.
Merge request reports
Activity
@matthieu fixed up the test. At the size of the time values I see +1 shouldn't be representable, so to me the mystery is why it worked in the first place. Maybe the absolute size of time has increased!
added zooms label
@matthieu this also makes no sense... you can go in and look at the branches individually and see the diff isn't based on the code actually on the branches :|
I did run a test locally where I made a branch off master and then merged zoom_merge into it and none of the conflicts GitLab is complaining about existed.
merged with merge request !1996 (merged)
Please register or sign in to reply