Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/777
No worries! I think it is easiest to do development from a branch other
than your master branch. Here is a sequence of commands that might work:
git checkout -b add_escape_utils
git fetch upstream master
git reset --hard upstream/master
git cherry-pick 2a4f1bd68a17d3fc765a9d6c8a4e48ef21c77bfe
git cherry-pick 37651b83bca350dd3c50da16e6b4eee0f2768a7f
git cherry-pick b3fbe7540ffa47905bbbfa172ca08da40387cc58
git cherry-pick 4e6a0d57958a3575b1bfd7647538aaf61b28c712
git cherry-pick fd63fe95eaadb31209bf245e393e60d0030dbb88
If you want to push this new branch, you'd need a new PR (this PR is
against your master branch). Otherwise (for now) you could update your own
master branch to look like this new one:
git checkout master
git reset --hard add_escape_utils
git push -f origin master
That would update this PR. For future contributions you may want to create
a new branch off upstream/master and do your development there, it makes
rebasing a lot easier. For example, in your local master, every time you do a
"git pull upstream master" you will get a merge commit (like you see in this
branch/PR).
If something gets messed up and (god forbid) you don't have your commits
after any of this, I took the liberty of doing the above and pushing to my
fork: https://github.com/mattyb149/nifi/tree/add_escape_utils
Looking forward to having this contribution in NiFi, thanks again!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
