Not every Ember upgrade goes as planned. Back out - to fight another day, by stashing your WIP to a Gist.
gem install gist
gist --login
git diff | gist -p -f wip-upgrade.diff
# -> returns a url, save the url to later restore your diff
curl <gist_url> | git apply