| #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)) |
First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)
$ git checkout masterFetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master
| package myJourney; | |
| import java.util.Scanner; | |
| public class NumberElement { | |
| public static void main(String[] args) { | |
| Scanner scanner = new Scanner(System.in); | |
| System.out.print("Enter a Number : "); |
| package myJourney; | |
| import java.text.NumberFormat; | |
| import java.util.Scanner; | |
| public class Calculator { | |
| public static void main(String[] args) { | |
| final byte MONTHS_IN_A_YEAR = 12; | |
| final byte PERCENT = 100; |
| package gui; | |
| import javax.swing.*; //i am to use JOptionPane | |
| public class Rectangle { | |
| public static void main(String[] args) { | |
| // TODO Auto-generated method stub | |
| double width, length, area, perimeter; | |
| String lengthstr, widthstr, outputstr; | |
| lengthstr = JOptionPane.showInputDialog("Enter the Length:"); |
| /** | |
| * Java implementation of the Bisection method for solving equations. | |
| * | |
| * @author samuel | |
| */ | |
| public class Bisection { | |
| private static final float TOLORANCE = (float) 0.01; | |
| /** |