msm update - Error running update_skill on fallback-query: Fast-forwarding not possible

[kjcole]

Hardware and OS release:

I've got a Mark 1 running:

$ lsb_release -a
No LSB modules are available.
Distributor ID: Raspbian
Description:    Raspbian GNU/Linux 8.0 (jessie)
Release:        8.0
Codename:       jessie

$ dpkg -l | grep mycroft
ii  mycroft-core         18.8.12   armhf   mycroft-core
ii  mycroft-mark-1       18.8.12   armhf   A metapackage for the Mycroft Mark-1 device
ii  mycroft-wifi-setup   0.2.5     armhf   mycroft-wifi-setup and mycroft-admin-service

The problem:

$ msm update
INFO - Nothing new for mycroft-mark-1
INFO - Nothing new for mycroft-support-helper
INFO - Nothing new for mycroft-date-time
INFO - Nothing new for mycroft-npr-news
INFO - Nothing new for fallback-unknown
INFO - Nothing new for skill-wolfram-alpha
INFO - Nothing new for mycroft-stock
INFO - Nothing new for mycroft-audio-record
INFO - Nothing new for mycroft-fallback-duck-duck-go
INFO - Nothing new for mycroft-spotify
INFO - Nothing new for mycroft-naptime
INFO - Nothing new for mycroft-stop
INFO - Nothing new for fallback-wolfram-alpha
INFO - Nothing new for mycroft-weather
INFO - Nothing new for mycroft-installer
INFO - Nothing new for mycroft-pandora
INFO - Nothing new for mycroft-singing
INFO - Nothing new for mycroft-joke
INFO - Nothing new for mycroft-mark-1-demo
INFO - Nothing new for mycroft-hello-world
INFO - Nothing new for pianobar-skill
INFO - Nothing new for skill-media
ERROR - Error running update_skill on fallback-query: GitException(Git command failed: GitCommandError(['git', 'merge', '--ff-only', '954f29c3cde87bf9a763514ead79f904b2303d1b'], 128, b'fatal: Not possible to fast-forward, aborting.', b''))
INFO - Nothing new for mycroft-playback-control
INFO - Nothing new for mycroft-timer
INFO - Nothing new for mycroft-speak
INFO - Nothing new for mycroft-volume
INFO - Nothing new for skill-desktop-launcher
INFO - Nothing new for mycroft-configuration
INFO - Nothing new for mycroft-pairing
INFO - Nothing new for mycroft-alarm
INFO - Nothing new for mycroft-reminder
INFO - Nothing new for mycroft-ip
INFO - Nothing new for mycroft-spelling
INFO - Nothing new for mycroft-personal
INFO - Nothing new for mycroft-version-checker
INFO - Nothing new for mycroft-wiki
INFO - Nothing new for fallback-aiml

Support ticket generated log of logs:

I'm liking the "create support ticket" skill... This was my first attempt at using it. So, see the attached generated "log of logs"

[forslund]

Hi, thanks for reporting. It seems like the git history has been a bit messed up here. I'll see if I can resolve this in a nice manner.

[forslund]

Can you please retry now?

[kjcole]

Can you please retry now?

Problem solved.