Github user Ramizjon commented on the issue:
https://github.com/apache/nifi/pull/655
Thank you a lot for detailed explanation. But unfortunately i still face
problems while doing that, so i'll describe what i'm doing step-by-step.
1) I'm on master. Do `git fetch --all`. Then `git status` says
> Your branch is up-to-date with 'origin/master'.
> nothing to commit, working directory clean
2) I do `git checkout -b ramizjon_datadog`. Switched to new branch.
3) When i do `git show HEAD~8` i see "added datadog bundle" commit message.
Well, this is my first commit.
4) Do `git reset --soft HEAD~8`. `git status` shows me hundreds of files.
5) I do `git reset` to unstage all the files.
6) I add all my files(that i've ever created or modified) via `git add
<filename>`.
7) I do `git commit -m "squashing commits"`.
8) As you've recommended i do `git reset HEAD --hard` to get rid of changes
i don't want to commit. I see
> HEAD is now at da9ceac squashing commits
9) I do `git rebase origin/master`. And see
> error: The following untracked working tree files would be overwritten by
checkout:
>....
10) Ok, i add all files to index.
11) I do `git rebase origin/master` again. I see some messages with content
like this.
> CONFLICT (rename/delete):
nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/api/MetricBuilder.java
deleted in squashing commits and renamed in HEAD. Version HEAD of
nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/api/MetricBuilder.java
left in tree.
> error: Failed to merge in the changes.
> Patch failed at 0001 squashing commits
At this step i realize that something went wrong. Could you please tell at
what step has occured the mistake? Sorry for taking your time while resolving
this issue...
---
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.
---
