Github user JPercivall commented on the issue:
https://github.com/apache/nifi/pull/655
No problem, happy to help get it right and learn.
When you do "git status" on the master branch it will tel you "you are X
number of commits ahead of origin/master and Y number of commits behind
origin/master" (may be other way around, did it from memory). This just means
that you start differing from what origin/master has X commits ago and there
are Y more commits beyond that point in origin/master.
So you will do "git reset HEAD~X" where X is the number of commits you are
ahead. This will bring you back to a common point with origin/master but leave
the changes that were made as unstaged/uncommitted changes.
After performing the steps you should be at a point where it says (when
running "git status") "you are 1 commit ahead of master". This 1 commit should
have all the changes you made for the Datadog implementation (and only those
changes).
The "reflog" is a history of all the git commands you do. So if you get too
mixed up, you can use reflog to rewind back to a certain command (ie. before
you started everything).
---
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.
---
