Page History

...

Are located in '<code checkout location>/nifi-docs/src/main/asciidoc' and can be changed by making changes to the ASCIIdoc files and following the code contribution process described in "Providing code or documentation contributions" section of this document.

...

As with other contributions, component level documentation should follow the process described in "Providing code or documentation contributions" section of this document.

...

If you are working on a branch over an extended period of time, it helps to keep your code current with the main branch main branch to ensure your changes are applied as anticipated and to facilitate the merging process.

...

Steps to merge/close pull requests with two main branches

As NiFi now has a 1.0 x (mastermain) and 01.x.y (support) branchbranches, pull requests (PR) must may be applied to both, but typically will only be targetted at main. Here is a step-by-step guide for committers to ensure this occurs for all PRs.

1. Check out the latest master main

1. 1. $ git checkout mastermain
   2. $ git pull upstream mastermain
2. Check out the PR (example #327). This will be in detached-HEAD state. (Note: You may need to edit the .git/config file to add the fetch lines below)

1. 1. $ git checkout github/pr/327
2. Create a branch for the PR

...

1. 1. $ git commit --amend -s
   2. Edit the commit file to contain "This closes #327. "
   3. $ git log
   4. Copy commit id of last commit
2. Switch back to the master main branch

1. 1. $ git checkout mastermain
2. Merge the changes. You can use cherry-pick, merge, etc.

...

1. 1. $ git log
2. Push to the Apache repository (master main branch)

1. 1. $ git push apache mastermain
2. (Optional) Switch to the support branch - the following steps are only required if the change is specifically being targetted for a patch release of an existing build (e.g. a bug fix to create 1.15.3 from the 1.15.2 build)

1. 1. $ git checkout -t upstreamsupport/01.x.y
2. (Optional) Check the status of the branch

1. 1. $ git log
2. (Optional) Apply the changes from the PR branch

1. 1. $ git cherry-pick <commit id>
2. (Optional) Push to the Apache repository (support branch)

1. 1. $ git push apache 0.x

Anchor
fetch-config fetch-config

Fetch Config

...