On 6/9/2025 3:50 PM, Tim Allison wrote:
Weird. I was just able to push
https://github.com/apache/tika/commit/520f2cd69cd2a70315b8d395cab983c3631f8f76
directly to main.
I did git pull beforehand (as you did).
Thank you. It works now. The weird thing is that it did a merge of
"tika-parent/pom.xml" despite that there weren't any remote changes there.
Tilman
git pull
remote: Enumerating objects: 67, done.
remote: Counting objects: 100% (67/67), done.
remote: Compressing objects: 100% (32/32), done.
remote: Total 39 (delta 17), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (39/39), 39.27 KiB | 242.00 KiB/s, done.
From https://gitbox.apache.org/repos/asf/tika
9ab4f89db..520f2cd69 main -> origin/main
* [new branch] TIKA-4424 -> origin/TIKA-4424
*Auto-merging tika-parent/pom.xml*
Merge made by the 'ort' strategy.
README.md | 2 +-
tika-parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
