Console Output
+ export BASE_REPO=omero-zarr-pixel-buffer.git
+ BASE_REPO=omero-zarr-pixel-buffer.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ unset VIRTUAL_ENV_PROMPT
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-zarr-pixel-buffer-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ VIRTUAL_ENV_PROMPT='(venv) '
++ export VIRTUAL_ENV_PROMPT
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2026-05-13 00:34:54,628 [ scc.config] DEBUG Found github.token
2026-05-13 00:34:54,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2026-05-13 00:34:54,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:34:55,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:34:55,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2026-05-13 00:34:55,694 [ scc.gh] DEBUG 4722 remaining from 5000 (Reset at 01:05
2026-05-13 00:34:55,694 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2026-05-13 00:34:55,697 [ scc.git] DEBUG Check current status
2026-05-13 00:34:55,697 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-05-13 00:34:55,699 [ scc.git] DEBUG 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-05-13 00:34:55,699 [ scc.git] DEBUG Calling 'git submodule status'
2026-05-13 00:34:55,736 [ scc.config] DEBUG Found remote.origin.url
2026-05-13 00:34:56,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer HTTP/1.1" 200 None
2026-05-13 00:34:56,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2026-05-13 00:34:57,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2026-05-13 00:34:57,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2026-05-13 00:34:58,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2026-05-13 00:34:58,136 [ scc.git] DEBUG Resetting...
2026-05-13 00:34:58,136 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2026-05-13 00:34:58,143 [ scc.git] DEBUG HEAD is now at 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-05-13 00:34:58,143 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2026-05-13 00:34:58,180 [ scc.git] DEBUG Check current status
2026-05-13 00:34:58,180 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-05-13 00:34:58,183 [ scc.git] DEBUG 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-05-13 00:34:58,183 [ scc.git] DEBUG Calling 'git submodule status'
2026-05-13 00:34:58,219 [ scc.merge] INFO Merging Pull Request(s) based on master
2026-05-13 00:34:58,219 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2026-05-13 00:34:58,219 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2026-05-13 00:34:58,219 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2026-05-13 00:34:58,219 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2026-05-13 00:34:58,219 [ scc.repo] DEBUG ## PRs found:
2026-05-13 00:34:58,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/pulls HTTP/1.1" 200 None
2026-05-13 00:34:59,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/15 HTTP/1.1" 200 None
2026-05-13 00:34:59,212 [ scc.repo] DEBUG - PR 15 dominikl 'Zarr v3 support'
2026-05-13 00:34:59,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/12 HTTP/1.1" 200 None
2026-05-13 00:35:00,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/10 HTTP/1.1" 200 None
2026-05-13 00:35:00,234 [ scc.repo] DEBUG ## Branches found:
2026-05-13 00:35:00,234 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:00,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:00,236 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2026-05-13 00:35:00,239 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2026-05-13 00:35:00,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2026-05-13 00:35:00,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2026-05-13 00:35:00,244 [ scc.git] DEBUG Already up to date.
2026-05-13 00:35:00,244 [ scc.git] DEBUG Calling 'git fetch origin pull/15/head'
2026-05-13 00:35:00,587 [ scc.git] DEBUG From https://github.com/ome/omero-zarr-pixel-buffer
2026-05-13 00:35:00,587 [ scc.git] DEBUG * branch refs/pull/15/head -> FETCH_HEAD
2026-05-13 00:35:00,591 [ scc.git] DEBUG ## Unique users: []
2026-05-13 00:35:00,592 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:00,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:00,594 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:00,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:00,688 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 15 (Zarr v3 support) f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging .github/workflows/build.yml
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .github/workflows/build.yml
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging README.md
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging build.gradle
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2026-05-13 00:35:00,704 [ scc.git] DEBUG warning: Cannot merge binary files: gradle/wrapper/gradle-wrapper.jar (HEAD vs. f872c446595a91702fc2341846342e318dd69904)
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging gradle/wrapper/gradle-wrapper.jar
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradle/wrapper/gradle-wrapper.jar
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging gradle/wrapper/gradle-wrapper.properties
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradle/wrapper/gradle-wrapper.properties
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging gradlew
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradlew
2026-05-13 00:35:00,704 [ scc.git] DEBUG Auto-merging gradlew.bat
2026-05-13 00:35:00,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradlew.bat
2026-05-13 00:35:00,704 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2026-05-13 00:35:00,705 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2026-05-13 00:35:00,709 [ scc.git] DEBUG Calling 'git reset --hard 3e9b9dafce22abae92d59ecc1cdb81161c16c2a7'
2026-05-13 00:35:00,715 [ scc.git] DEBUG HEAD is now at 3e9b9da Merge remote-tracking branch 'glencoe/master'
2026-05-13 00:35:00,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:35:00,891 [ scc.git] DEBUG Calling 'git merge-base 3e9b9dafce22abae92d59ecc1cdb81161c16c2a7 f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:00,893 [ scc.git] DEBUG Calling 'git diff --name-only f7116d6f3f523d1e9220524bf9e551f267832167..3e9b9dafce22abae92d59ecc1cdb81161c16c2a7'
2026-05-13 00:35:00,896 [ scc.git] INFO - PR 15 dominikl 'Zarr v3 support'
Conflicting PR. Removed from build [OMERO-zarr-pixel-buffer-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .github/workflows/build.yml
- gradlew.bat
- gradlew
- build.gradle
- gradle/wrapper/gradle-wrapper.properties
- gradle/wrapper/gradle-wrapper.jar
--conflicts
2026-05-13 00:35:00,898 [ scc.config] DEBUG Found github.token
2026-05-13 00:35:00,898 [ scc.git] DEBUG Adding comment to issue #15.
2026-05-13 00:35:01,755 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-zarr-pixel-buffer/issues/15/comments HTTP/1.1" 201 2224
2026-05-13 00:35:01,756 [ scc.git] DEBUG Calling 'git submodule update'
2026-05-13 00:35:01,793 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:01,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:01,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2026-05-13 00:35:01,807 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4a0ca04ad0> has no local changes
2026-05-13 00:35:01,807 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-zarr-pixel-buffer
Excluded PRs:
- PR 12 Rdornier 'Adding other required dependencies' (user: Rdornier)
- PR 10 Rdornier 'Install jars' (user: Rdornier)
Already up to date.
Conflicting PRs (not included):
- PR 15 dominikl 'Zarr v3 support'
Generated by OMERO-zarr-pixel-buffer-push#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/)'
2026-05-13 00:35:01,813 [ scc.git] DEBUG [detached HEAD 0b4eefb] merge master -Dorg -Snone
2026-05-13 00:35:01,813 [ scc.merge] INFO Repository: ome/omero-zarr-pixel-buffer
2026-05-13 00:35:01,813 [ scc.merge] INFO Excluded PRs:
2026-05-13 00:35:01,813 [ scc.merge] INFO - PR 12 Rdornier 'Adding other required dependencies' (user: Rdornier)
2026-05-13 00:35:01,813 [ scc.merge] INFO - PR 10 Rdornier 'Install jars' (user: Rdornier)
2026-05-13 00:35:01,813 [ scc.merge] INFO Already up to date.
2026-05-13 00:35:01,813 [ scc.merge] INFO
2026-05-13 00:35:01,813 [ scc.merge] INFO Conflicting PRs (not included):
2026-05-13 00:35:01,813 [ scc.merge] INFO - PR 15 dominikl 'Zarr v3 support'
2026-05-13 00:35:01,813 [ scc.merge] INFO
2026-05-13 00:35:01,813 [ scc.merge] DEBUG Cleaning remote branches created for merging
2026-05-13 00:35:01,813 [ scc.git] DEBUG Calling 'git remote'
Merge all submodules2026-05-13 00:35:02,269 [ scc.config] DEBUG Found github.token
2026-05-13 00:35:02,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2026-05-13 00:35:02,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:35:03,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:35:03,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2026-05-13 00:35:03,439 [ scc.gh] DEBUG 4715 remaining from 5000 (Reset at 01:05
2026-05-13 00:35:03,440 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2026-05-13 00:35:03,442 [ scc.git] DEBUG Check current status
2026-05-13 00:35:03,442 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-05-13 00:35:03,444 [ scc.git] DEBUG 0b4eefb merge master -Dorg -Snone
2026-05-13 00:35:03,444 [ scc.git] DEBUG Calling 'git submodule status'
2026-05-13 00:35:03,482 [ scc.config] DEBUG Found remote.origin.url
2026-05-13 00:35:04,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer HTTP/1.1" 200 None
2026-05-13 00:35:04,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2026-05-13 00:35:04,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2026-05-13 00:35:05,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2026-05-13 00:35:05,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2026-05-13 00:35:05,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2026-05-13 00:35:05,910 [ scc.git] DEBUG Resetting...
2026-05-13 00:35:05,910 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2026-05-13 00:35:05,914 [ scc.git] DEBUG HEAD is now at 0b4eefb merge master -Dorg -Snone
2026-05-13 00:35:05,914 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2026-05-13 00:35:05,951 [ scc.git] DEBUG Check current status
2026-05-13 00:35:05,951 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2026-05-13 00:35:05,953 [ scc.git] DEBUG 0b4eefb merge master -Dorg -Snone
2026-05-13 00:35:05,953 [ scc.git] DEBUG Calling 'git submodule status'
2026-05-13 00:35:05,990 [ scc.merge] INFO Merging Pull Request(s) based on master
2026-05-13 00:35:05,990 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2026-05-13 00:35:05,990 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2026-05-13 00:35:05,990 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2026-05-13 00:35:05,990 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2026-05-13 00:35:05,990 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2026-05-13 00:35:05,990 [ scc.repo] DEBUG ## PRs found:
2026-05-13 00:35:06,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/pulls HTTP/1.1" 200 None
2026-05-13 00:35:06,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/15 HTTP/1.1" 200 None
2026-05-13 00:35:07,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/f872c446595a91702fc2341846342e318dd69904?page=1 HTTP/1.1" 200 None
2026-05-13 00:35:08,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/f872c446595a91702fc2341846342e318dd69904/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2026-05-13 00:35:08,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/f872c446595a91702fc2341846342e318dd69904/check-suites?app_id=15368 HTTP/1.1" 200 None
2026-05-13 00:35:09,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/commits/f872c446595a91702fc2341846342e318dd69904?page=1 HTTP/1.1" 200 None
2026-05-13 00:35:09,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/statuses/f872c446595a91702fc2341846342e318dd69904?per_page=1 HTTP/1.1" 200 2
2026-05-13 00:35:09,540 [ scc.repo] DEBUG - PR 15 dominikl 'Zarr v3 support'
2026-05-13 00:35:10,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/12 HTTP/1.1" 200 None
2026-05-13 00:35:10,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-zarr-pixel-buffer/issues/10 HTTP/1.1" 200 None
2026-05-13 00:35:10,617 [ scc.repo] DEBUG ## Branches found:
2026-05-13 00:35:10,617 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:10,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:10,619 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2026-05-13 00:35:10,622 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2026-05-13 00:35:10,622 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2026-05-13 00:35:10,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2026-05-13 00:35:10,627 [ scc.git] DEBUG Already up to date.
2026-05-13 00:35:10,627 [ scc.git] DEBUG Calling 'git fetch origin pull/15/head'
2026-05-13 00:35:10,949 [ scc.git] DEBUG From https://github.com/ome/omero-zarr-pixel-buffer
2026-05-13 00:35:10,949 [ scc.git] DEBUG * branch refs/pull/15/head -> FETCH_HEAD
2026-05-13 00:35:10,953 [ scc.git] DEBUG ## Unique users: []
2026-05-13 00:35:10,953 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:10,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:10,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:10,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:10,961 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 15 (Zarr v3 support) f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging .github/workflows/build.yml
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .github/workflows/build.yml
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging README.md
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging build.gradle
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2026-05-13 00:35:10,973 [ scc.git] DEBUG warning: Cannot merge binary files: gradle/wrapper/gradle-wrapper.jar (HEAD vs. f872c446595a91702fc2341846342e318dd69904)
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging gradle/wrapper/gradle-wrapper.jar
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradle/wrapper/gradle-wrapper.jar
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging gradle/wrapper/gradle-wrapper.properties
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradle/wrapper/gradle-wrapper.properties
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging gradlew
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradlew
2026-05-13 00:35:10,973 [ scc.git] DEBUG Auto-merging gradlew.bat
2026-05-13 00:35:10,973 [ scc.git] DEBUG CONFLICT (content): Merge conflict in gradlew.bat
2026-05-13 00:35:10,973 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2026-05-13 00:35:10,973 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2026-05-13 00:35:10,978 [ scc.git] DEBUG Calling 'git reset --hard 0b4eefb74037815209541b6f5e5cd7f551c130da'
2026-05-13 00:35:10,984 [ scc.git] DEBUG HEAD is now at 0b4eefb merge master -Dorg -Snone
2026-05-13 00:35:11,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2026-05-13 00:35:11,181 [ scc.git] DEBUG Calling 'git merge-base 0b4eefb74037815209541b6f5e5cd7f551c130da f872c446595a91702fc2341846342e318dd69904'
2026-05-13 00:35:11,184 [ scc.git] DEBUG Calling 'git diff --name-only f7116d6f3f523d1e9220524bf9e551f267832167..0b4eefb74037815209541b6f5e5cd7f551c130da'
2026-05-13 00:35:11,187 [ scc.git] INFO - PR 15 dominikl 'Zarr v3 support'
Conflicting PR. Removed from build [OMERO-zarr-pixel-buffer-push#153](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/consoleText) for more details.
Possible conflicts:
- Upstream changes
- gradlew
- gradlew.bat
- .github/workflows/build.yml
- gradle/wrapper/gradle-wrapper.jar
- build.gradle
- gradle/wrapper/gradle-wrapper.properties
--conflicts
2026-05-13 00:35:11,189 [ scc.config] DEBUG Found github.token
2026-05-13 00:35:11,189 [ scc.git] DEBUG Adding comment to issue #15.
2026-05-13 00:35:12,062 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-zarr-pixel-buffer/issues/15/comments HTTP/1.1" 201 2224
2026-05-13 00:35:12,063 [ scc.git] DEBUG Calling 'git submodule update'
2026-05-13 00:35:12,101 [ scc.git] DEBUG Get sha1 of %s
2026-05-13 00:35:12,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2026-05-13 00:35:12,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2026-05-13 00:35:12,139 [ scc.git] DEBUG Calling 'git status --porcelain'
2026-05-13 00:35:12,144 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0e3d4d8410> has no local changes
2026-05-13 00:35:12,144 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-zarr-pixel-buffer
Excluded PRs:
- PR 12 Rdornier 'Adding other required dependencies' (user: Rdornier)
- PR 10 Rdornier 'Install jars' (user: Rdornier)
Already up to date.
Conflicting PRs (not included):
- PR 15 dominikl 'Zarr v3 support'
Generated by OMERO-zarr-pixel-buffer-push#153 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-zarr-pixel-buffer-push/153/)'
2026-05-13 00:35:12,150 [ scc.git] DEBUG [detached HEAD 58c9be3] merge master -Dorg -Ssuccess-only
2026-05-13 00:35:12,150 [ scc.merge] INFO Repository: ome/omero-zarr-pixel-buffer
2026-05-13 00:35:12,150 [ scc.merge] INFO Excluded PRs:
2026-05-13 00:35:12,150 [ scc.merge] INFO - PR 12 Rdornier 'Adding other required dependencies' (user: Rdornier)
2026-05-13 00:35:12,150 [ scc.merge] INFO - PR 10 Rdornier 'Install jars' (user: Rdornier)
2026-05-13 00:35:12,150 [ scc.merge] INFO Already up to date.
2026-05-13 00:35:12,150 [ scc.merge] INFO
2026-05-13 00:35:12,150 [ scc.merge] INFO Conflicting PRs (not included):
2026-05-13 00:35:12,150 [ scc.merge] INFO - PR 15 dominikl 'Zarr v3 support'
2026-05-13 00:35:12,150 [ scc.merge] INFO
2026-05-13 00:35:12,150 [ scc.merge] DEBUG Cleaning remote branches created for merging
2026-05-13 00:35:12,150 [ scc.git] DEBUG Calling 'git remote'
Update component versions
grep: settings.gradle: No such file or directory
Commit all component version changes
HEAD detached from 3e9b9da
nothing to commit, working tree clean
2026-05-13 00:35:18,717 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-zarr-pixel-buffer/tree/merge_ci
