New Upstream Snapshot - gitmagic
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 20160304+git20210413.1.9fdc185 resulted in conflicts.
- quilt-refresh-error: An error occurred refreshing quilt patch 03-remove-google-analytics.patch: Applying patch debian/patches/03-remove-google-analytics.patch patching file custom-html.xsl Hunk #1 FAILED at 15. 1 out of 1 hunk FAILED -- rejects in file custom-html.xsl Patch debian/patches/03-remove-google-analytics.patch does not apply (enforce with -f)
- command-failed: Command 'SCHROOT=unstable-amd64-sbuild PYTHONPATH=/:/code:/code/breezy:/code/dulwich:/code/lintian-brush:/code/ognibuild:/code/silver-platter:/code/buildlog-consultant:/code/upstream-ontologist:/code/debmutate:/code/python-debian/lib:/usr/lib/python39.zip:/usr/lib/python3.9:/usr/lib/python3.9/lib-dynload:/usr/local/lib/python3.9/dist-packages:/usr/lib/python3/dist-packages /usr/bin/python3 -m janitor.dist --packaging=/tmp/janitorr2j_2vk9/gitmagic/debian' returned non-zero exit status 1.