Xeinn commented on issue #4104: NIFI-7159 - Add support for some data types in various processors URL: https://github.com/apache/nifi/pull/4104#issuecomment-599368815 Thanks Mike, That’ll help. Will tackle it this evening and shout if I have problems/questions Sent from Mail<https://go.microsoft.com/fwlink/?LinkId=550986> for Windows 10 ________________________________ From: Mike <[email protected]> Sent: Sunday, March 15, 2020 1:21:09 PM To: apache/nifi <[email protected]> Cc: Chris Manniex <[email protected]>; Mention <[email protected]> Subject: Re: [apache/nifi] NIFI-7159 - Add support for some data types in various processors (#4104) @Xeinn<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FXeinn&data=02%7C01%7C%7C2263074bc9c546305bd208d7c8e3ba1a%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637198752708391176&sdata=QP6Ul1JuqCThkQQg3S01T8aZqsjpe1roKp0QiBetcqw%3D&reserved=0> 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. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fapache%2Fnifi%2Fpull%2F4104%23issuecomment-599209694&data=02%7C01%7C%7C2263074bc9c546305bd208d7c8e3ba1a%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637198752708401167&sdata=qtGlAFv8ejfLeZ86havjZ0d7n3A9ss4pXT0mNNPdhSs%3D&reserved=0>, or unsubscribe<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAFHXE7CDMKCJ5NRHQYJ2C73RHTI4LANCNFSM4K72OIGA&data=02%7C01%7C%7C2263074bc9c546305bd208d7c8e3ba1a%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637198752708411162&sdata=hYnvlM5lYzNdYTUaM%2BpZjC2BzBC1nQEEoCTEq1ZP6eA%3D&reserved=0>.
---------------------------------------------------------------- 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
