Github user mattallenuk commented on the issue:
https://github.com/apache/tinkerpop/pull/889
```
First, rewinding head to replay your work on top of it...
Generating patches: 100% (757/757), done.
Applying: valueMap should always return string keys
Using index info to reconstruct a base tree...
M
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
M
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
M
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
.git/rebase-apply/patch:33: space before tab in indent.
// add tokens, as string keys
.git/rebase-apply/patch:57: trailing whitespace.
.git/rebase-apply/patch:60: space before tab in indent.
new ScriptTraversal<>(g, "gremlin-groovy",
"g.V().hasLabel('person').filter(__.outE('created')).valueMap(true)")
.git/rebase-apply/patch:72: trailing whitespace.
.git/rebase-apply/patch:135: trailing whitespace.
*
warning: squelched 19 whitespace errors
warning: 24 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
CONFLICT (content): Merge conflict in
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
Auto-merging
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
CONFLICT (content): Merge conflict in
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
Auto-merging
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
error: Failed to merge in the changes.
Patch failed at 0001 valueMap should always return string keys
Use 'git am --show-current-patch' to see the failed patch
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase
--abort".
```
---
