you have changes in your index (incremental changes). either create a new commit or git reset problem files - which works best in your current situation
to avoid conflicts with changes in the working directory, run them using git stash save , return the cherry disk, and then git stash pop back. otherwise you can fix them and then choose cherry
source share