I don't think your PR should contain any lines beyond the last one in this diff. I would just revert your CHANGELOG modification in your branch, rebase the whole PR on tp34 and then add your one line back (and squash) so that it's clean. does that make sense?
Worst case, if it's taking too much time and you can't figure it out, just revert your CHANGELOG modification, copy/paste your CHANGELOG entry to the comments on this PR and I'll add it manually on merge. thanks. [ Full content available at: https://github.com/apache/tinkerpop/pull/1228 ] This message was relayed via gitbox.apache.org for [email protected]
