gef-classic icon indicating copy to clipboard operation
gef-classic copied to clipboard

Reintegrate Zest 2.x fork into master

Open ptziegler opened this issue 1 year ago • 1 comments

ptziegler avatar Jul 11 '24 17:07 ptziegler

Test Results

   24 files     24 suites   7m 22s :stopwatch:   458 tests   457 :white_check_mark:  1 :zzz: 0 :x: 2 748 runs  2 734 :white_check_mark: 14 :zzz: 0 :x:

Results for commit fb6711ca.

:recycle: This comment has been updated with latest results.

github-actions[bot] avatar Jul 11 '24 18:07 github-actions[bot]

@azoitl I've rebased the branch for a final time and from my perspective, we're good to go. Is there anything still open or can I finally press this big green button?

ptziegler avatar Sep 17 '24 17:09 ptziegler

How can there be "conflicts", dear GitHub?...

image

ptziegler avatar Sep 17 '24 18:09 ptziegler

This is strange. Appart from the merge conflict I would say we should merge it.

azoitl avatar Sep 17 '24 18:09 azoitl

I have no clue what GitHub was on about, but I suppose the merge has worked now...

ptziegler avatar Sep 17 '24 19:09 ptziegler

I have no clue what GitHub was on about, but I suppose the merge has worked now...

We don't have to understand everything ;-)

azoitl avatar Sep 17 '24 19:09 azoitl