Error: error: Your local changes to the following files would be overwritten by merge:

[linonetwo]

Describe the bug

Run EndBug/[email protected]

  

  
    Wed, 28 Apr 2021 07:09:22 GMT
    Running in /home/runner/work/CDDA-Kenan-Modpack-Chinese/CDDA-Kenan-Modpack-Chinese

  

  
    Wed, 28 Apr 2021 07:09:22 GMT
    Add input parsed as single string, running 1 git add command.

  

  
    Wed, 28 Apr 2021 07:09:22 GMT
    > Using 'linonetwo <[email protected]>' as author.

  

  
    Wed, 28 Apr 2021 07:09:22 GMT
    > Using "feat: 自动拉取Paratranz最新内容并发布" as commit message.

  

  
    Wed, 28 Apr 2021 07:09:22 GMT
    Internal logs

  

  
    
  
    Wed, 28 Apr 2021 07:09:43 GMT
    Outputs

  

  
    Wed, 28 Apr 2021 07:09:43 GMT
    Error: Error: error: Your local changes to the following files would be overwritten by merge:

  

  
    	中文翻译/Arcana.json

  

  
    	中文翻译/Fallout_CDDA.json

  

  
    	中文翻译/secronom.json

  

  
    	中文翻译/secronom_lore_expansion.json

  
    Please commit your changes or stash them before you merge.
    Aborting

Workflow used

https://github.com/linonetwo/CDDA-Kenan-Modpack-Chinese/blob/28ae4db5b2021fbd9c0fc627530c8834828f41e7/.github/workflows/release-mod.yml#L63-L66

Expected behavior

It add and commit and push witout error

Logs

https://github.com/linonetwo/CDDA-Kenan-Modpack-Chinese/runs/2455149076?check_suite_focus=true

[EndBug]

I think it's better if you disable pulling for the actions, you can use this step:

- name: Add & Commit
   uses: EndBug/[email protected]
   with:
     message: 'feat: 自动拉取Paratranz最新内容并发布'
     pull_strategy: NO-PULL

Let me know if that solves the issue for you.

[linonetwo]

It works, thank you!