Diverging Paths when Auto-Committing in Parallel Jobs

[anerishah18]

Hi,

I have a workflow with jobs like the following running in parallel:

jobs:
   job-1:
       steps:
           uses: actions/checkout@v3
           ...
           uses: stefanzweifel/git-auto-commit-action@v4
   job-2:
       steps:
           uses: actions/checkout@v3
           ...
           uses: stefanzweifel/git-auto-commit-action@v4

Say that job-1 finishes first. Trying to generate the auto-commit in job-2 says that the paths have diverged since job-1 already made a commit to the branch, making the branch checked out in job-2 behind the remote. I was wondering what the best way forward would be? I could make the auto-commit action force-push using the push_options config, but this would cause the changes from job-1 to be overwritten by the changes in job-2 even though the changes are not technically conflicting. Based on the searches I did, I couldn't really find a way to pull the latest branch before creating the auto-commit.

[stefanzweifel]

What you certainly can do, is add a git pull-step, before running git-auto-commit-action.

- name: Pull Remote Changes
  run: git pull

But I'm not this will work 100% of the time. By running jobs in parallel you're potentially creating a race-condition. Which commit should "win", if both commits are created in the same second?

See also these threads, where others had a similar issue:

• fatal: protocol error: bad line length character: erro #283 (comment)
• Add option for pulling the changes before pushing #229 (comment)
• Handle failed push error when head falls behind #209 (comment)