You are viewing a plain text version of this content. The canonical link for it is here.

Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/03/15 13:20:58 UTC

[GitHub] [nifi] MikeThomsen commented on issue #4104: NIFI-7159 - Add support for some data types in various processors

MikeThomsen commented on issue #4104: NIFI-7159 - Add support for some data types in various processors
URL: https://github.com/apache/nifi/pull/4104#issuecomment-599209694
 
 
   @Xeinn there's a merge conflict now. Instructions follow if you're newish to git. Otherwise ignore.
   
   To resolve do the following:
   
   1. Pull apache/nifi master into your master.
   2. Rebase (git rebase master) your branch off of master again.
   3. Follow the prompts that git gives you. Be careful to read what it says.
   4. git push origin --force BRANCH.
   
   **Don't** git pull apache/nifi master into your 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:
users@infra.apache.org


With regards,
Apache Git Services