[GitHub] [nifi] dan-s1 commented on pull request #6720: [NIFI-10876] Made changes to convert from JUnit 4 to JUnit 5

[GitBox <gi...@apache.org>]

dan-s1 commented on PR #6720:
URL: https://github.com/apache/nifi/pull/6720#issuecomment-1329438971

   > @dan-s1 You also have a merge conflict. Do a rebase (ie don't do merge main into your branch).
   @MikeThomsen  So I rebased and merged the conflict with TestAbstractComponentNode by taking the server changes and not mine. But now I have an issue when I am trying to push changes based on your code review. After running
   `git push origin NIFI-10876`
   
   I am getting:
   
   > ! [rejected]        NIFI-10876 -> NIFI-10876 (non-fast-forward)
   error: failed to push some refs to 'git@github.com:dan-s1/nifi.git'
   hint: Updates were rejected because the tip of your current branch is behind
   hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
   hint: before pushing again.
   hint: See the 'Note about fast-forwards' in 'git push --help' for details.
   
   When I try to run
   `git pull`
   I get 
   
   > There is no tracking information for the current branch.
   Please specify which branch you want to merge with.
   See git-pull(1) for details
   
   Please advise how to fix this . Thanks!


-- 
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: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org