Skip to content

Instantly share code, notes, and snippets.

@alopresto
alopresto / Merging PR for 2 branches
Last active Jan 6, 2021
Instructions to merge pull requests for multiple branches (master, support, etc.)
View Merging PR for 2 branches
#Steps to merge/close pull requests with two main branches
As NiFi now has a 1.0 (master) and 0.x (support) branch, pull requests (PR) must be applied to both. Here is a step-by-step guide for committers to ensure this occurs for all PRs.
1. Check out the latest master
``` $ git checkout master
$ git pull upstream master
```
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](#fetch))