fix missing run
@@ -470,8 +470,6 @@ jobs:
- name: See if there are merge conflicts
id: conflicts
run: |
-
-
git config --local user.email "merge-conflicts-bot@pymedphys.com"
git config --local user.name "PyMedPhys Merge Conflicts Bot"
@@ -505,6 +503,7 @@ jobs:
- name: Fix poetry.lock conflicts
if: steps.conflicts.outputs.status == 'true'
+ run: |
git config --local user.email "merge-conflicts-bot@pymedphys.com"
git config --local user.name "PyMedPhys Merge Conflicts Bot"
@@ -524,9 +523,6 @@ jobs:
branch: ${{ github.event.pull_request.head.ref }}
-
-
-
PyPI:
# needs:
# - PreCommit
