chore(brencher): conflicting — rename registry profile to registry.conflicting_change #45

Open
hermes wants to merge 2 commits from hermes/brencher:conflicting into main_corrupted
Contributor

Branch HEAD msg: conflicting change. Renames registry profile to registry.conflicting_change in docker-compose.yml. Likely a scratch conflict-repro branch — opening PR to surface it instead of leaving it in the fork.

Branch HEAD msg: `conflicting change`. Renames `registry` profile to `registry.conflicting_change` in `docker-compose.yml`. Likely a scratch conflict-repro branch — opening PR to surface it instead of leaving it in the fork.
hermes added 1 commit 2026-09-03 19:49:03 +02:00
conflicting change
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.13) (pull_request) Successful in 2m44s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.14) (pull_request) Successful in 46s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.12.3) (pull_request) Successful in 50s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.13) (pull_request) Successful in 33s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.14) (pull_request) Successful in 32s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.12.3) (pull_request) Successful in 1m23s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.13) (pull_request) Successful in 1m21s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.14) (pull_request) Successful in 1m27s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.12.3) (pull_request) Failing after 10m26s
Python package / build (pip list, 3.12.3) (pull_request) Successful in 32s
Python package / build (pip list, 3.13) (pull_request) Successful in 32s
Python package / build (pip list, 3.14) (pull_request) Successful in 33s
Python package / build (pytest --ignore=tests/integration, 3.12.3) (pull_request) Successful in 43s
Python package / build (pytest --ignore=tests/integration, 3.13) (pull_request) Successful in 45s
Python package / build (pytest --ignore=tests/integration, 3.14) (pull_request) Successful in 46s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.12.3) (pull_request) Successful in 28s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.13) (pull_request) Successful in 31s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.14) (pull_request) Successful in 28s
f2077de4eb
hermes added 1 commit 2026-09-03 20:12:44 +02:00
Merge remote-tracking branch 'upstream/main' into tmp-fix-conflicting
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.12.3) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.13) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.14) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.12.3) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.13) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.14) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.12.3) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.13) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.14) (pull_request) Canceled after 0s
Python package / build (pip list, 3.12.3) (pull_request) Canceled after 0s
Python package / build (pip list, 3.13) (pull_request) Canceled after 0s
Python package / build (pip list, 3.14) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.12.3) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.13) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.14) (pull_request) Canceled after 0s
d9cc93d073
# Conflicts:
#	docker-compose.yml
Some required checks failed
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.12.3) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.13) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics, 3.14) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.12.3) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.13) (pull_request) Canceled after 0s
Python package / build (flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics, 3.14) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.12.3) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.13) (pull_request) Canceled after 0s
Python package / build (mypy --no-incremental --config-file mypy.ini backend tests, 3.14) (pull_request) Canceled after 0s
Python package / build (pip list, 3.12.3) (pull_request) Canceled after 0s
Python package / build (pip list, 3.13) (pull_request) Canceled after 0s
Python package / build (pip list, 3.14) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.12.3) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.13) (pull_request) Canceled after 0s
Python package / build (python -c "import sys; print(f'Python {sys.version}'); print(f'Build: {sys.version_info}'); print(f'Implementation: {sys.implementation}')", 3.14) (pull_request) Canceled after 0s
Checking for merge conflicts…
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u https://gitea.rudolf.keenetic.link/hermes/brencher conflicting:hermes-conflicting
git checkout hermes-conflicting
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: admin/brencher#45