Mycroft Community Forum

Mycroft Skills merge conflict

Is there a way to purge the skills and add the back in? tbh im not sure what i did but i have been hacking around with mycroft and now when i run msm update this happens

 20:07:17.989 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-volume: MergeConflict
 20:07:18.189 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-ip: MergeConflict
 20:07:18.482 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-personal: MergeConflict
 20:07:18.661 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on fallback-query: MergeConflict
 20:07:18.952 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-playback-control: MergeConflict
 20:07:19.170 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-spelling: MergeConflict
 20:07:19.445 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-hello-world: MergeConflict
 20:07:19.698 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on fallback-unknown: MergeConflict
 20:07:20.143 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-reminder: MergeConflict
 20:07:20.216 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-version-checker: MergeConflict
 20:07:20.426 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on respeaker-io-skill.domcross: MergeConflict
 20:07:20.460 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-pairing: MergeConflict
 20:07:20.632 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-naptime: MergeConflict
 20:07:20.766 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-fallback-duck-duck-go: MergeConflict
 20:07:20.843 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-stop: MergeConflict
 20:07:20.993 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-audio-record: MergeConflict
 20:07:21.292 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-singing: MergeConflict
 20:07:21.477 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-alarm: SkillModified(Uncommitted changes:
     D __init__.py
)20:07:21.706 | ERROR    |   841 | msm.mycroft_skills_manager | Error running install_or_update on mycroft-configuration: MergeConflict

Not sure on that.
But maybe you can check your changes or rollback your local changes in skill folder by using git commands:

  • git diff (show local changes)

  • git reset

  • git reset --hard

For anyone who has this problem this is what i did to fix it.

i ran

msm update #to get the errors
msm remove "skill" #remove the skill that errored
msm install "skill" #installed it back 

there might be a quicker way but this is how i fixed it.

1 Like

Got this multiple times this weekend. Even indicating all files were edited locally. Yet this is fluctuating and most likely isn’t happening with the next boot.

The origin has to be found in the (update) code (or it’s a github thing), so i wouldn’t make a fuzz about it (at least for now)