Help with Upgrade to v1.13.x
-
Running into an issue that normally doesn't happen:
mike@lemp-1gb-nyc3-01:/var/www/html/community$ git fetch remote: Enumerating objects: 1508, done. remote: Counting objects: 100% (1508/1508), done. remote: Total 2132 (delta 1507), reused 1508 (delta 1507), pack-reused 624 Receiving objects: 100% (2132/2132), 461.43 KiB | 0 bytes/s, done. Resolving deltas: 100% (1793/1793), completed with 585 local objects. From https://github.com/NodeBB/NodeBB 72fd9f6..c35a21d master -> origin/master 52d48cb..3e38eba openapi-docs -> origin/openapi-docs * [new branch] protocol-vs-scheme-absolute-url-check -> origin/protocol-vs-scheme-absolute-url-check * [new branch] renovate/commander-4.x -> origin/renovate/commander-4.x + 8cc5e49...b1d48c7 renovate/eslint-plugin-import-2.x -> origin/renovate/eslint-plugin-import-2.x (forced update) * [new branch] renovate/jsdom-16.x -> origin/renovate/jsdom-16.x * [new branch] v1.13.x -> origin/v1.13.x * [new tag] v1.13.1 -> v1.13.1 * [new tag] v1.13.0 -> v1.13.0 mike@lemp-1gb-nyc3-01:/var/www/html/community$ git checkout v1.13.x package.json: needs merge src/controllers/authentication.js: needs merge error: you need to resolve your current index firstI'm not sure how to "resolve the current index first" in this situation. What am I doing wrong?
-
git status?
-
For some context, I had a plugin commissioned by NodeBB crew and had to install the latest master to get it to work. So I'm not sure if that might have affected how I do upgrades. I haven't upgraded since then. Does that mean I need to do something differently?
The
git statuswas so much info I couldn't copy it all from putty. Here's a sample:modified: public/vendor/jquery/timeago/locales/jquery.timeago.pt.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.ro.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.rs.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.ru.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.rw.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.si.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.sk.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.sl.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.sr.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.sv.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.th.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.tr-short.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.tr.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.uk.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.vi.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.zh-CN.js modified: public/vendor/jquery/timeago/locales/jquery.timeago.zh-TW.js modified: public/vendor/mdl/material.css modified: public/vendor/nprogress.min.js modified: public/vendor/requirejs/require.js modified: public/vendor/semver/semver.browser.js modified: public/vendor/slideout/slideout.min.js modified: public/vendor/tinycon/tinycon.js modified: public/vendor/visibility/visibility.min.js modified: public/vendor/xregexp/unicode/unicode-base.js modified: public/vendor/xregexp/unicode/unicode-blocks.js modified: public/vendor/xregexp/unicode/unicode-categories.js modified: public/vendor/xregexp/unicode/unicode-properties.js modified: public/vendor/xregexp/unicode/unicode-scripts.js modified: public/vendor/xregexp/xregexp.js modified: renovate.json modified: require-main.js modified: src/admin/search.js modified: src/admin/versions.js modified: src/analytics.js modified: src/batch.js modified: src/cache.js modified: src/categories/activeusers.js modified: src/categories/create.js modified: src/categories/data.js modified: src/categories/delete.js modified: src/categories/index.js modified: src/categories/recentreplies.js modified: src/categories/topics.js modified: src/categories/unread.js modified: src/categories/update.js modified: src/categories/watch.js modified: src/cli/colors.js modified: src/cli/index.js modified: src/cli/manage.js modified: src/cli/package-install.js modified: src/cli/paths.js modified: src/cli/reset.js modified: src/cli/running.js modified: src/cli/setup.js modified: src/cli/upgrade-plugins.js modified: src/cli/upgrade.js modified: src/controllers/404.js modified: src/controllers/accounts.js modified: src/controllers/accounts/blocks.js modified: src/controllers/accounts/categories.js modified: src/controllers/accounts/chats.js modified: src/controllers/accounts/consent.js modified: src/controllers/accounts/edit.js modified: src/controllers/accounts/follow.js modified: src/controllers/accounts/groups.js modified: src/controllers/accounts/helpers.js modified: src/controllers/accounts/info.js modified: src/controllers/accounts/notifications.js modified: src/controllers/accounts/posts.js modified: src/controllers/accounts/profile.js modified: src/controllers/accounts/sessions.js modified: src/controllers/accounts/settings.js modified: src/controllers/accounts/uploads.js modified: src/controllers/admin.js modified: src/controllers/admin/admins-mods.js modified: src/controllers/admin/appearance.js modified: src/controllers/admin/blacklist.js modified: src/controllers/admin/cache.js modified: src/controllers/admin/categories.js modified: src/controllers/admin/dashboard.js modified: src/controllers/admin/database.js modified: src/controllers/admin/errors.js modified: src/controllers/admin/events.js modified: src/controllers/admin/groups.js modified: src/controllers/admin/homepage.js modified: src/controllers/admin/hooks.js modified: src/controllers/admin/info.js modified: src/controllers/admin/languages.js modified: src/controllers/admin/logger.js modified: src/controllers/admin/logs.js modified: src/controllers/admin/navigation.js modified: src/controllers/admin/plugins.js modified: src/controllers/admin/postqueue.js modified: src/controllers/admin/privileges.js modified: src/controllers/admin/rewards.js modified: src/controllers/admin/settings.js modified: src/controllers/admin/social.js modified: src/controllers/admin/sounds.js modified: src/controllers/admin/tags.js modified: src/controllers/admin/themes.js modified: src/controllers/admin/uploads.js modified: src/controllers/admin/users.js modified: src/controllers/admin/widgets.js modified: src/controllers/api.js modified: src/controllers/categories.js modified: src/controllers/category.js modified: src/controllers/composer.js modified: src/controllers/errors.js modified: src/controllers/globalmods.js modified: src/controllers/groups.js modified: src/controllers/helpers.js modified: src/controllers/home.js modified: src/controllers/index.js modified: src/controllers/mods.js modified: src/controllers/osd.js modified: src/controllers/ping.js modified: src/controllers/popular.js modified: src/controllers/posts.js modified: src/controllers/recent.js modified: src/controllers/search.js modified: src/controllers/sitemap.js modified: src/controllers/tags.js modified: src/controllers/top.js modified: src/controllers/topics.js modified: src/controllers/unread.js modified: src/controllers/uploads.js modified: src/controllers/user.js modified: src/controllers/users.js modified: src/coverPhoto.js modified: src/database/cache.js modified: src/database/helpers.js modified: src/database/index.js modified: src/database/mongo.js modified: src/database/mongo/connection.js modified: src/database/mongo/hash.js modified: src/database/mongo/helpers.js modified: src/database/mongo/list.js modified: src/database/mongo/main.js modified: src/database/mongo/pubsub.js modified: src/database/mongo/sets.js modified: src/database/mongo/sorted.js modified: src/database/mongo/sorted/add.js modified: src/database/mongo/sorted/intersect.js modified: src/database/mongo/sorted/remove.js modified: src/database/mongo/sorted/union.js modified: src/database/mongo/transaction.js modified: src/database/postgres.js modified: src/database/postgres/connection.js modified: src/database/postgres/hash.js modified: src/database/postgres/helpers.js modified: src/database/postgres/list.js modified: src/database/postgres/main.js modified: src/database/postgres/pubsub.js modified: src/database/postgres/sets.js modified: src/database/postgres/sorted.js modified: src/database/postgres/sorted/add.js modified: src/database/postgres/sorted/intersect.js modified: src/database/postgres/sorted/remove.js modified: src/database/postgres/sorted/union.js modified: src/database/postgres/transaction.js modified: src/database/redis.js modified: src/database/redis/connection.js modified: src/database/redis/hash.js modified: src/database/redis/helpers.js modified: src/database/redis/list.js modified: src/database/redis/main.js modified: src/database/redis/promisify.js modified: src/database/redis/pubsub.js modified: src/database/redis/sets.js modified: src/database/redis/sorted.js modified: src/database/redis/sorted/add.js modified: src/database/redis/sorted/intersect.js modified: src/database/redis/sorted/remove.js modified: src/database/redis/sorted/union.js modified: src/database/redis/transaction.js modified: src/emailer.js modified: src/events.js modified: src/file.js modified: src/flags.js modified: src/groups/cache.js modified: src/groups/cover.js modified: src/groups/create.js modified: src/groups/data.js modified: src/groups/delete.js modified: src/groups/index.js modified: src/groups/invite.js modified: src/groups/join.js modified: src/groups/leave.js modified: src/groups/membership.js modified: src/groups/ownership.js modified: src/groups/posts.js modified: src/groups/search.js modified: src/groups/update.js modified: src/groups/user.js modified: src/image.js modified: src/install.js modified: src/languages.js modified: src/logger.js modified: src/messaging/create.js modified: src/messaging/data.js modified: src/messaging/delete.js modified: src/messaging/edit.js modified: src/messaging/index.js modified: src/messaging/notifications.js modified: src/messaging/rooms.js modified: src/messaging/unread.js modified: src/meta/blacklist.js modified: src/meta/build.js modified: src/meta/cacheBuster.js modified: src/meta/configs.js modified: src/meta/css.js modified: src/meta/debugFork.js modified: src/meta/dependencies.js modified: src/meta/errors.js modified: src/meta/index.js modified: src/meta/js.js modified: src/meta/languages.js modified: src/meta/logs.js modified: src/meta/minifier.js modified: src/meta/settings.js modified: src/meta/sounds.js modified: src/meta/tags.js modified: src/meta/templates.js modified: src/meta/themes.js modified: src/middleware/admin.js modified: src/middleware/header.js modified: src/middleware/headers.js modified: src/middleware/index.js modified: src/middleware/maintenance.js modified: src/middleware/ratelimit.js modified: src/middleware/render.js modified: src/middleware/user.js modified: src/navigation/admin.js modified: src/navigation/index.js modified: src/notifications.js modified: src/pagination.js modified: src/password.js modified: src/plugins/data.js modified: src/plugins/hooks.js modified: src/plugins/index.js modified: src/plugins/install.js modified: src/plugins/load.js modified: src/plugins/usage.js modified: src/posts/bookmarks.js modified: src/posts/cache.js modified: src/posts/category.js modified: src/posts/create.js modified: src/posts/data.js modified: src/posts/delete.js modified: src/posts/diffs.js modified: src/posts/edit.js modified: src/posts/index.js modified: src/posts/parse.js modified: src/posts/queue.js modified: src/posts/recent.js modified: src/posts/summary.js modified: src/posts/tools.js modified: src/posts/topics.js modified: src/posts/uploads.js modified: src/posts/user.js modified: src/posts/votes.js modified: src/prestart.js modified: src/privileges/categories.js modified: src/privileges/global.js modified: src/privileges/helpers.js modified: src/privileges/index.js modified: src/privileges/posts.js modified: src/privileges/topics.js modified: src/privileges/users.js modified: src/promisify.js modified: src/pubsub.js modified: src/rewards/admin.js modified: src/rewards/index.js modified: src/routes/accounts.js modified: src/routes/admin.js modified: src/routes/api.js modified: src/routes/authentication.js modified: src/routes/debug.js modified: src/routes/feeds.js modified: src/routes/helpers.js modified: src/routes/index.js modified: src/routes/meta.js modified: src/search.js modified: src/settings.js modified: src/sitemap.js modified: src/social.js modified: src/socket.io/admin.js modified: src/socket.io/admin/categories.js modified: src/socket.io/admin/groups.js modified: src/socket.io/admin/navigation.js modified: src/socket.io/admin/rewards.js modified: src/socket.io/admin/rooms.js modified: src/socket.io/admin/social.js modified: src/socket.io/admin/tags.js modified: src/socket.io/admin/user.js modified: src/socket.io/blacklist.js modified: src/socket.io/categories.js modified: src/socket.io/flags.js modified: src/socket.io/groups.js modified: src/socket.io/helpers.js modified: src/socket.io/index.js modified: src/socket.io/meta.js modified: src/socket.io/modules.js modified: src/socket.io/notifications.js modified: src/socket.io/plugins.js modified: src/socket.io/posts.js modified: src/socket.io/posts/bookmarks.js modified: src/socket.io/posts/diffs.js modified: src/socket.io/posts/edit.js modified: src/socket.io/posts/helpers.js modified: src/socket.io/posts/move.js modified: src/socket.io/posts/tools.js modified: src/socket.io/posts/votes.js modified: src/socket.io/single-host-cluster.js modified: src/socket.io/topics.js modified: src/socket.io/topics/infinitescroll.js modified: src/socket.io/topics/merge.js modified: src/socket.io/topics/move.js modified: src/socket.io/topics/tags.js modified: src/socket.io/topics/tools.js modified: src/socket.io/topics/unread.js modified: src/socket.io/user.js modified: src/socket.io/user/ban.js modified: src/socket.io/user/picture.js modified: src/socket.io/user/profile.js modified: src/socket.io/user/registration.js modified: src/socket.io/user/search.js modified: src/socket.io/user/status.js modified: src/start.js modified: src/topics/bookmarks.js modified: src/topics/create.js modified: src/topics/data.js modified: src/topics/delete.js modified: src/topics/follow.js modified: src/topics/fork.js modified: src/topics/index.js modified: src/topics/merge.js modified: src/topics/posts.js modified: src/topics/recent.js modified: src/topics/sorted.js modified: src/topics/suggested.js modified: src/topics/tags.js modified: src/topics/teaser.js modified: src/topics/thumb.js modified: src/topics/tools.js modified: src/topics/unread.js modified: src/topics/user.js modified: src/translator.js modified: src/upgrade.js modified: src/upgrades/1.0.0/chat_room_hashes.js modified: src/upgrades/1.0.0/chat_upgrade.js modified: src/upgrades/1.0.0/global_moderators.js modified: src/upgrades/1.0.0/social_post_sharing.js modified: src/upgrades/1.0.0/theme_to_active_plugins.js modified: src/upgrades/1.0.0/user_best_posts.js modified: src/upgrades/1.0.0/users_notvalidated.js modified: src/upgrades/1.1.0/assign_topic_read_privilege.js modified: src/upgrades/1.1.0/dismiss_flags_from_deleted_topics.js modified: src/upgrades/1.1.0/group_title_update.js modified: src/upgrades/1.1.0/separate_upvote_downvote.js modified: src/upgrades/1.1.0/user_post_count_per_tid.js modified: src/upgrades/1.1.1/remove_negative_best_posts.js modified: src/upgrades/1.1.1/upload_privileges.js modified: src/upgrades/1.10.0/hash_recent_ip_addresses.js modified: src/upgrades/1.10.0/post_history_privilege.js modified: src/upgrades/1.10.0/search_privileges.js modified: src/upgrades/1.10.0/view_deleted_privilege.js modified: src/upgrades/1.10.2/event_filters.js modified: src/upgrades/1.10.2/fix_category_post_zsets.js modified: src/upgrades/1.10.2/fix_category_topic_zsets.js modified: src/upgrades/1.10.2/local_login_privileges.js modified: src/upgrades/1.10.2/postgres_sessions.js modified: src/upgrades/1.10.2/upgrade_bans_to_hashes.js modified: src/upgrades/1.10.2/username_email_history.js modified: src/upgrades/1.11.0/navigation_visibility_groups.js modified: src/upgrades/1.11.0/resize_image_width.js modified: src/upgrades/1.11.0/widget_visibility_groups.js modified: src/upgrades/1.11.1/remove_ignored_cids_per_user.js modified: src/upgrades/1.12.0/category_watch_state.js modified: src/upgrades/1.12.0/global_view_privileges.js modified: src/upgrades/1.12.0/group_create_privilege.js modified: src/upgrades/1.12.1/clear_username_email_history.js modified: src/upgrades/1.12.1/moderation_notes_refactor.js modified: src/upgrades/1.12.1/post_upload_sizes.js modified: src/upgrades/1.12.3/disable_plugin_metrics.js modified: src/upgrades/1.12.3/give_mod_info_privilege.js modified: src/upgrades/1.12.3/give_mod_privileges.js modified: src/upgrades/1.12.3/update_registration_type.js modified: src/upgrades/1.12.3/user_pid_sets.js modified: src/upgrades/1.13.0/clean_flag_byCid.js modified: src/upgrades/1.13.0/clean_post_topic_hash.js modified: src/upgrades/1.13.0/cleanup_old_notifications.js modified: src/upgrades/1.2.0/category_recent_tids.js modified: src/upgrades/1.2.0/edit_delete_deletetopic_privileges.js modified: src/upgrades/1.3.0/favourites_to_bookmarks.js modified: src/upgrades/1.3.0/sorted_sets_for_post_replies.js modified: src/upgrades/1.4.0/global_and_user_language_keys.js modified: src/upgrades/1.4.0/sorted_set_for_pinned_topics.js modified: src/upgrades/1.4.4/config_urls_update.js modified: src/upgrades/1.4.4/sound_settings.js modified: src/upgrades/1.4.6/delete_sessions.js modified: src/upgrades/1.5.0/allowed_file_extensions.js modified: src/upgrades/1.5.0/flags_refactor.js modified: src/upgrades/1.5.0/moderation_history_refactor.js modified: src/upgrades/1.5.0/post_votes_zset.js modified: src/upgrades/1.5.0/remove_relative_uploaded_profile_cover.js modified: src/upgrades/1.5.1/rename_mods_group.js modified: src/upgrades/1.5.2/rss_token_wipe.js modified: src/upgrades/1.5.2/tags_privilege.js modified: src/upgrades/1.6.0/clear-stale-digest-template.js modified: src/upgrades/1.6.0/generate-email-logo.js modified: src/upgrades/1.6.0/ipblacklist-fix.js modified: src/upgrades/1.6.0/robots-config-change.js modified: src/upgrades/1.6.2/topics_lastposttime_zset.js modified: src/upgrades/1.7.0/generate-custom-html.js modified: src/upgrades/1.7.1/notification-settings.js modified: src/upgrades/1.7.3/key_value_schema_change.js modified: src/upgrades/1.7.3/topic_votes.js modified: src/upgrades/1.7.4/chat_privilege.js modified: src/upgrades/1.7.4/fix_moved_topics_byvotes.js modified: src/upgrades/1.7.4/fix_user_topics_per_category.js modified: src/upgrades/1.7.4/global_upload_privilege.js modified: src/upgrades/1.7.4/rename_min_reputation_settings.js modified: src/upgrades/1.7.4/vote_privilege.js modified: src/upgrades/1.7.6/flatten_navigation_data.js modified: src/upgrades/1.7.6/notification_types.js modified: src/upgrades/1.7.6/update_min_pass_strength.js modified: src/upgrades/1.8.0/give_signature_privileges.js modified: src/upgrades/1.8.0/give_spiders_privileges.js modified: src/upgrades/1.8.1/diffs_zset_to_listhash.js modified: src/upgrades/1.9.0/refresh_post_upload_associations.js modified: src/upgrades/TEMPLATE modified: src/user/admin.js modified: src/user/approval.js modified: src/user/auth.js modified: src/user/bans.js modified: src/user/blocks.js modified: src/user/categories.js modified: src/user/create.js modified: src/user/data.js modified: src/user/delete.js modified: src/user/digest.js modified: src/user/email.js modified: src/user/follow.js modified: src/user/index.js modified: src/user/info.js modified: src/user/invite.js modified: src/user/jobs.js modified: src/user/notifications.js modified: src/user/online.js modified: src/user/password.js modified: src/user/picture.js modified: src/user/posts.js modified: src/user/profile.js modified: src/user/reset.js modified: src/user/search.js modified: src/user/settings.js modified: src/user/topics.js modified: src/user/uploads.js modified: src/utils.js modified: src/views/400.tpl modified: src/views/403.tpl modified: src/views/404.tpl modified: src/views/500-embed.tpl modified: src/views/500.tpl modified: src/views/503.tpl modified: src/views/admin/advanced/cache.tpl modified: src/views/admin/advanced/database.tpl modified: src/views/admin/advanced/errors.tpl modified: src/views/admin/advanced/events.tpl modified: src/views/admin/advanced/hooks.tpl modified: src/views/admin/advanced/logs.tpl modified: src/views/admin/appearance/customise.tpl modified: src/views/admin/appearance/skins.tpl modified: src/views/admin/appearance/themes.tpl modified: src/views/admin/development/info.tpl modified: src/views/admin/development/logger.tpl modified: src/views/admin/extend/plugins.tpl modified: src/views/admin/extend/rewards.tpl modified: src/views/admin/extend/widgets.tpl modified: src/views/admin/footer.tpl modified: src/views/admin/general/dashboard.tpl modified: src/views/admin/general/homepage.tpl modified: src/views/admin/general/languages.tpl modified: src/views/admin/general/navigation.tpl modified: src/views/admin/general/social.tpl modified: src/views/admin/general/sounds.tpl modified: src/views/admin/header.tpl modified: src/views/admin/manage/admins-mods.tpl modified: src/views/admin/manage/categories.tpl modified: src/views/admin/manage/category-analytics.tpl modified: src/views/admin/manage/category.tpl modified: src/views/admin/manage/group.tpl modified: src/views/admin/manage/groups.tpl modified: src/views/admin/manage/ip-blacklist.tpl modified: src/views/admin/manage/post-queue.tpl modified: src/views/admin/manage/privileges.tpl modified: src/views/admin/manage/registration.tpl modified: src/views/admin/manage/tags.tpl modified: src/views/admin/manage/uploads.tpl modified: src/views/admin/manage/users.tpl modified: src/views/admin/partials/blacklist-validate.tpl modified: src/views/admin/partials/categories/category-rows.tpl modified: src/views/admin/partials/categories/copy-settings.tpl modified: src/views/admin/partials/categories/create.tpl modified: src/views/admin/partials/categories/groups.tpl modified: src/views/admin/partials/categories/privileges.tpl modified: src/views/admin/partials/categories/purge.tpl modified: src/views/admin/partials/categories/select-category.tpl modified: src/views/admin/partials/categories/users.tpl modified: src/views/admin/partials/create_user_modal.tpl modified: src/views/admin/partials/download_plugin_item.tpl modified: src/views/admin/partials/global/privileges.tpl modified: src/views/admin/partials/groups/memberlist.tpl modified: src/views/admin/partials/installed_plugin_item.tpl modified: src/views/admin/partials/menu.tpl modified: src/views/admin/partials/pageviews-range-select.tpl modified: src/views/admin/partials/plugins/license.tpl modified: src/views/admin/partials/quick_actions/alerts.tpl modified: src/views/admin/partials/quick_actions/buttons.tpl modified: src/views/admin/partials/settings/footer.tpl modified: src/views/admin/partials/settings/header.tpl modified: src/views/admin/partials/temporary-ban.tpl modified: src/views/admin/partials/theme_list.tpl modified: src/views/admin/partials/widget-settings.tpl modified: src/views/admin/settings/advanced.tpl modified: src/views/admin/settings/chat.tpl modified: src/views/admin/settings/cookies.tpl modified: src/views/admin/settings/email.tpl modified: src/views/admin/settings/general.tpl modified: src/views/admin/settings/group.tpl modified: src/views/admin/settings/guest.tpl modified: src/views/admin/settings/notifications.tpl modified: src/views/admin/settings/pagination.tpl modified: src/views/admin/settings/post.tpl modified: src/views/admin/settings/reputation.tpl modified: src/views/admin/settings/sockets.tpl modified: src/views/admin/settings/tags.tpl modified: src/views/admin/settings/uploads.tpl modified: src/views/admin/settings/user.tpl modified: src/views/admin/settings/web-crawler.tpl modified: src/views/emails/banned.tpl modified: src/views/emails/digest.tpl modified: src/views/emails/invitation.tpl modified: src/views/emails/notification.tpl modified: src/views/emails/partials/footer.tpl modified: src/views/emails/partials/header.tpl modified: src/views/emails/registration_accepted.tpl modified: src/views/emails/reset.tpl modified: src/views/emails/reset_notify.tpl modified: src/views/emails/test.tpl modified: src/views/emails/verify_email.tpl modified: src/views/emails/welcome.tpl modified: src/views/install/index.tpl modified: src/views/modals/crop_picture.tpl modified: src/views/partials/data/category.tpl modified: src/views/partials/data/topic.tpl modified: src/views/partials/fontawesome.tpl modified: src/views/partials/gdpr_consent.tpl modified: src/views/sitemap.tpl modified: src/webserver.js modified: src/widgets/admin.js modified: src/widgets/index.js modified: test/.eslintrc modified: test/authentication.js modified: test/batch.js modified: test/blacklist.js modified: test/build.js modified: test/categories.js modified: test/controllers-admin.js modified: test/controllers.js modified: test/coverPhoto.js modified: test/database.js modified: test/database/hash.js modified: test/database/keys.js modified: test/database/list.js modified: test/database/sets.js modified: test/database/sorted.js modified: test/defer-logger.js modified: test/emailer.js modified: test/feeds.js modified: test/file.js modified: test/files/1.css modified: test/files/1.js modified: test/files/2.js modified: test/files/2.less modified: test/files/503.html modified: test/files/brokenimage.png modified: test/files/favicon.ico modified: test/files/normalise.jpg modified: test/files/notanimage.png modified: test/files/test.png modified: test/files/test.wav modified: test/files/toobig.jpg modified: test/flags.js modified: test/groups.js modified: test/helpers/index.js modified: test/image.js modified: test/locale-detect.js modified: test/messaging.js modified: test/meta.js modified: test/mocha.opts modified: test/mocks/databasemock.js modified: test/mocks/plugin_modules/@nodebb/another-thing/package.json modified: test/mocks/plugin_modules/@nodebb/another-thing/plugin.json modified: test/mocks/plugin_modules/@nodebb/nodebb-plugin-abc/package.json modified: test/mocks/plugin_modules/@nodebb/nodebb-plugin-abc/plugin.json modified: test/mocks/plugin_modules/nodebb-plugin-xyz/package.json modified: test/mocks/plugin_modules/nodebb-plugin-xyz/plugin.json modified: test/mocks/plugin_modules/something-else/package.json modified: test/mocks/plugin_modules/something-else/plugin.json modified: test/notifications.js modified: test/pagination.js modified: test/plugins.js modified: test/posts.js modified: test/pubsub.js modified: test/rewards.js modified: test/search-admin.js modified: test/search.js modified: test/settings.js modified: test/socket.io.js modified: test/template-helpers.js modified: test/topics.js modified: test/translator.js modified: test/uploads.js modified: test/user.js modified: test/utils.js
-
Try running
git reset --hard HEADthengit checkout v1.13.x
-
That worked beautifully.
For future upgrades, should I do the same reset if I run into that issue?
-
@Michael-Pfaff yeah I'd check
git statusbefore doing anything and run reset if there are changes
-
@PitaJ said in Help with Upgrade to v1.13.x:
@Michael-Pfaff yeah I'd check
git statusbefore doing anything and run reset if there are changesMuch appreciated @PitaJ!
Suggested Topics
Copyright © 2018 NodeBB | Contributors