MikeThomsen commented on pull request #3051: URL: https://github.com/apache/nifi/pull/3051#issuecomment-721094850
@aglotero what happened was is you did a merge of master instead of a rebase. It's a common mistake, but one that can cause a lot of problems for you in cases like this. The proper work flow in cases like this is: 1. git checkout main 2. git pull apache main 3. git checkout <branch name> 4. git rebase main 5. git push origin --force <branch name> (this is necessary since you updated the base of the feature branch) ---------------------------------------------------------------- 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]
