5 sub folders issue

[bdgregg]

This to better handle parrent folders and pid file indication in the Google Sheet. Claude has indicated that this is indeed the fix, however, I'm not sure why it shows "Can't automatically merge."

[ctgraham]

You can find the merge conflicts (which block the automatic merge) via the "Resolve conflicts" button:
https://github.com/ulsdevteam/scan-batch-dir/pull/13/conflicts

Here, for example, the current code in this branch still has the old pattern for field and field_model. So, git can't be sure if you are reverting that, or just didn't include it.

You can merge the destination branch master into this one to catch this branch up with the latest changes, or you can perform the conflict resolution within the merge of this branch into master. Either way, git needs to know which code you want to keep, the old pattern (no) or the new one (yes).

[bdgregg]

@ctgraham , in the following screenshot, I want the content below the "=======" line. The content above the "=======" was all condensed in the previous PR that was merged into master.

[ctgraham]

To discard 949 - 965, keeping 966 - 969, choose "Accept incoming change".

[bdgregg]

Conflicts resolved - ready for review.