pipenv conflicts in Kentucky

[stucka]

Kentucky for some reason keeps having problems where the pipenv files cause conflicts; I pull the branch, bring in the new pipfiles, push again, and then some days later get the same problem again.

I'm not even sure why the branches have Pipfiles as distinct from the main, or if there's a better way to keep these in sync.

A log run:

Switched to a new branch 'ky' branch 'ky' set up to track 'origin/ky'. From https://github.com/biglocalnews/warn-github-flow

• branch main -> FETCH_HEAD Auto-merging Pipfile CONFLICT (content): Merge conflict in Pipfile Auto-merging Pipfile.lock CONFLICT (content): Merge conflict in Pipfile.lock Automatic merge failed; fix conflicts and then commit the result. Error: Process completed with exit code 1.

[stucka]

It seems to be here: git config --global user.email "actions@github.com" git config --global user.name "GitHub Actions" git config pull.rebase false git checkout ${{ inputs.source }} git pull origin main

... why do the branches even have their own pipfiles? Do all of them?

[stucka]

Idea from Derek Willis -- see if the branches can have a .gitignore blocking the pipfile