pre-commit-hooks: package_checks.py failed for a cherry pick of xournalpp after resolved conflict

[TraceyC77]

trafficstars

Summary:

Attempted to cherry pick a commit for xournalpp. After fixing a merge conflict in package.yml, I was unable to do git cherry-pick --continue. The error makes it look like the check is finding the conflict markers, which were no longer in the package.yml

package.yml package-6NRA.txt

error output cherrypick_fail-LSMQ.txt

[silkeh]

Interesting issue. For next time: can you force through using git cherry-pick --continue --no-verify (as a workaround until we fix this)?