mattyb149 commented on PR #5710: URL: https://github.com/apache/nifi/pull/5710#issuecomment-1129041160
Yeah a lot of the commits are ones that are already in main, so something weird happened where they became commits in your branch rather than the "real" commits in the main branch. What I usually do is the following: 1) Isolate your commits in the current branch (i.e. the commit hashes) 2) Create a new branch off the latest main 3) Cherry-pick those commits from 1 in chronological order into the new branch 4) Now that your new branch is correct and up-to-date, you can either close this PR and issue another off the new branch, or delete the old branch, checkout the new branch, then recreate the old branch from the new branch. That way you can just force-push the old branch and it will update this PR -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
