I should have been more thorough, but yes, of course one must be careful. Which
is why I don’t necessarily like GUI merge tools.
NiFi is pretty well structured, so merge problems like you suggest should be
less likely unless refactoring of core happens a lot.
Git has a pretty smart merge
Brett,
You don't want to necessarily delete the other side and just keep the
section you've modified... There may be changes that were made to that
code that you'll want to add to your own changes. A simple example would
be that a new method call was added in the section that you've modified,
I must be an odd one, I’m more comfortable resolving conflicts from the cli ;)
The simplest way is the CSV resolution strategy. Edit each file looking for <<<
—- >>> blocks where conflicts are presented. Keep the section you want deleting
the other side, then git add the file. Do for all
Hi Devs,
I'm trying to create a PR for this branch in my fork
https://github.com/nologic/nifi/tree/NIFI-4731. I see that master has moved
on to 1.5.0 but I'd like to have the processor built for 1.4 and later.
It's the version we're using. However, I don't see an origin/1.4.0 based on
the
