ijokarumawak commented on issue #3541: NIFI-6387 Implemented RetryFlowFile URL: https://github.com/apache/nifi/pull/3541#issuecomment-508310099 @travisneeley Thanks for the updates! I wanted to resume reviewing, but this PR has more commits than needed. I'd like you to clean commits before finalizing review process. To do so, I'd suggest following commands: ```bash # Change the branch name (to create another one with the same branch name) $ git branch -m NIFI-6387-bk # Create NIFI-6387 branch again, with the latest master $ git checkout master $ git pull upstream master $ git checkout -b NIFI-6387 # Then, cherry-pick required commits from the backed-up branch, I assume the last 2 commits (other than the merge commit)? # NIFI-6387 Implemented RetryFlowFile (the initial commit) $ git cherry-pick ef4360b8a33f53c64fc6f58c6c35c79eeeadf228 # NIFI-6387 RetryFlowFile (updates based on review) $ git cherry-pick acad9394d87c3112423020db9e5e5d488ed30b15 # At this point, the branch should have two commits based on the latest master. Check the commits using 'log' command, then push it to clean this PR. $ git log $ git push -f -u origin NIFI-6387 ``` Please let me know if you have any question with the git commands. FYI, I am not sure what command you used to update this PR, but usually `rebase` command is preferable than `merge` when you want to update your branch with the latest master. For example I usually do: ```bash # While working on a local branch for a PR, get the latest master $ git fetch upstream master # rebase the PR branch with the latest master $ git rebase upstream/master # push it forcefully, to update the PR $ git push -f # Optionally, delete the backed up branch $ git branch -D NIFI-6387-bk ```
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
