Git pull - error: The following untracked working tree files would be overwritten by merge:

后端 未结 5 1760
深忆病人
深忆病人 2021-02-04 05:02

I keep getting this error when I do a git pull every 60 seconds on my monitoring server. I am using chef and a python script to \"git pull\" every 60 seconds.

         


        
5条回答
  •  梦如初夏
    2021-02-04 05:24

    Please move or remove them before you can merge.

    Aborting

    The solution is actually very simple:

    git clean  -d  -fx ""
    
    • X - delete ignore file has not identified for git files
    • D -- deletion was not added to the git in the path of the file
    • F - forced operation

提交回复
热议问题