search

Automattic / action-commit-to-branch

GitHub action that will commit the result to an input branch
17 stars 19 forks source link

Possibility to update the branch after the checkout? #4

Closed BoboTiG closed 4 years ago

BoboTiG commented 4 years ago

I got a situation when the master branch was not up-to-date:

Run Automattic/action-commit-to-branch@master
/usr/bin/docker run --name ...
Fetching origin
From https://github.com/BoboTiG/ebook-reader-dict
   55ea47a..27d8af6  master     -> origin/master
Fetching origin
Saved working directory and index state WIP on master: 55ea47a GH Actions: make the word effective
Already on 'master'
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   data/fr/words.count
    modified:   data/fr/words.list
    modified:   data/fr/words.snapshot

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (7a2afab41780911ef60d445dc419ab5641a112f1)
[master a4f95a1] Updated dicthtml-fr (1758426 words)
 3 files changed, 1758428 insertions(+)
To https://github.com/BoboTiG/ebook-reader-dict
 ! [rejected]        master -> master (non-fast-forward)

I might have this issue more frequently as jobs are running concurrently and all are pushing to master. Do you think it would be possible to add git pull just after doing the checkout?