These are chat archives for reactioncommerce/reaction
Pulling the latest updates from Github... From https://github.com/reactioncommerce/reaction 7691cfc..1eec469 master -> origin/master * [new branch] brent-fix-issue-1502 -> origin/brent-fix-issue-1502 734dde7..0162fe8 development -> origin/development * [new branch] email-1515 -> origin/email-1515 * [new branch] email-template-expansion -> origin/email-template-expansion + b67e173...afd7022 i18n-translations -> origin/i18n-translations (forced update) * [new branch] patches-0.17 -> origin/patches-0.17 * [new branch] release-0.18.0 -> origin/release-0.18.0 * [new tag] v0.17.0 -> v0.17.0 error: Your local changes to the following files would be overwritten by merge: .meteor/packages .meteor/release .meteor/versions Please, commit your changes or stash them before you can merge. Aborting Updating 7691cfc..1eec469
git reset HEAD —hard
reaction updateonce you had already pulled
get resetand be back to where you were
=> A patch (Meteor 18.104.22.168) for your current release is available!