Running into an issue that normally doesn't happen:
[email protected]:/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
[email protected]:/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 first
I'm not sure how to "resolve the current index first" in this situation. What am I doing wrong?