search

slub / ocrd_manager

frontend for ocrd_controller and adapter towards ocrd_kitodo
MIT License
10 stars 3 forks source link

Use rsync to transfer workdir to/from controller #22

Closed bertsky closed 2 years ago

bertsky commented 2 years ago

Sorry, just saw that I started the PR branch too early. Will rebase against current master and force-push...

markusweigelt commented 2 years ago

@bertsky can you merge the current master changes into this branch to resolve conflicts to finish pr?

bertsky commented 2 years ago

can you merge the current master changes into this branch to resolve conflicts to finish pr?

Ouch. It's very unfortunate that you renamed ocr.sh to ocrd_lib.sh while this PR was active. I now have to sync everything manually (not even 3-way merge is possible).

markusweigelt commented 2 years ago

Sorry i have not seen the pr or forgot to merge it. We can rename the file again and then rename back after the merge again.

markusweigelt commented 2 years ago

I renamed the file in main but can you merge or trigger pr again for auto merge. In current state of this pr, nothing seams to be changed in main repository.

bertsky commented 2 years ago

I renamed the file in main but can you merge or trigger pr again for auto merge. In current state of this pr, nothing seams to be changed in main repository.

I was already in the middle of it. Aborting and reentering, I don't have to trigger the diff by hand, but the differ now does not even show sub-region differences anymore.

bertsky commented 2 years ago

IOW, please rename back. I'll redo my manual merge.

bertsky commented 2 years ago

Done!