$ git checkout -b hm2-resolver-fix-for-master 6cae47a25a5a8a06843298d81564d78c077b9f6a
Switched to a new branch 'hm2-resolver-fix-for-master'
$ git revert 6cae47a25a5a8a06843298d81564d78c077b9f6a
Finished one revert.
[hm2-resolver-fix-for-master de9834f] Revert "Use a less bogus way to detect "index" with Resolvers."
 1 files changed, 2 insertions(+), 6 deletions(-)
$ git merge origin/master
# This merge should complete without conflicts
# Fix resolver for master; test; commit
$ git checkout master
$ git merge hm2-resolver-fix-for-master
# Should be no merge conflicts here unless someone also changed resolver in master branch
$ git push