2026-10-16 16:38:13 INFO run /tmp/tmpy3tt8l38source-git-clone# git -c advice.detachedHead=false clone --quiet https://github.com/ARPA-SIMC/arkimet --branch debian/latest
2026-10-16 16:38:17 INFO moncic.source.debian merge packaging branch ubuntu/jammy for test build
2026-10-16 16:38:17 INFO run /tmp/tmpy3tt8l38source-git-clone/arkimet# git checkout --quiet ubuntu/jammy
2026-10-16 16:38:17 INFO run /tmp/tmpy3tt8l38source-git-clone/arkimet# git -c user.email=moncic-ci@example.org -c user.name=Moncic-CI merge --quiet debian/latest -m 'CI merge'
Auto-merging debian/changelog
CONFLICT (content): Merge conflict in debian/changelog
Automatic merge failed; fix conflicts and then commit the result.
Traceback (most recent call last):
  File "/usr/bin/monci", line 6, in <module>
    main()
    ~~~~^^
  File "/usr/lib/python3.13/site-packages/moncic/__main__.py", line 51, in main
    return handler.run()
           ~~~~~~~~~~~^^
  File "/usr/lib/python3.13/site-packages/moncic/cli/build.py", line 115, in run
    with self.source(image.distro) as source:
         ~~~~~~~~~~~^^^^^^^^^^^^^^
  File "/usr/lib64/python3.13/contextlib.py", line 141, in __enter__
    return next(self.gen)
  File "/usr/lib/python3.13/site-packages/moncic/cli/moncic.py", line 346, in source
    yield self.distro_source(local_source, distro=distro)
          ~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.13/site-packages/moncic/cli/moncic.py", line 331, in distro_source
    return DistroSource.create_from_local(
           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
        source, distro=distro, style=self.args.source_type
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    )
    ^
  File "/usr/lib/python3.13/site-packages/moncic/source/distro.py", line 166, in create_from_local
    return meth(parent, distro=distro)
  File "/usr/lib/python3.13/site-packages/moncic/source/debian.py", line 659, in prepare_from_git
    command_log.run(
    ~~~~~~~~~~~~~~~^
        [
        ^
    ...<11 lines>...
        cwd=parent.repo.working_dir,
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    )
    ^
  File "/usr/lib/python3.13/site-packages/moncic/source/source.py", line 43, in run
    return run(cmd, **kwargs)
  File "/usr/lib/python3.13/site-packages/moncic/utils/run.py", line 37, in run
    return subprocess.run(cmd, check=check, **kw)
           ~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/lib64/python3.13/subprocess.py", line 577, in run
    raise CalledProcessError(retcode, process.args,
                             output=stdout, stderr=stderr)
subprocess.CalledProcessError: Command '['git', '-c', 'user.email=moncic-ci@example.org', '-c', 'user.name=Moncic-CI', 'merge', '--quiet', 'debian/latest', '-m', 'CI merge']' returned non-zero exit status 1.