git cherry-pick says local changes exist, but git status says nothing

后端 未结 6 1513
失恋的感觉
失恋的感觉 2021-02-20 02:17
$ git cherry-pick 5de83068
error: Your local changes to the following files would be overwritten by merge:
        Components/ApplicationEnums/Application.cs
Please, commit yo         


        
6条回答
  •  不思量自难忘°
    2021-02-20 02:32

    The patch from the cherry-pick does not align in terms of the seams of where the changes would be applied. Do a --no-commit to see what happens.

提交回复
热议问题