From 3a53305e6297f0d89750c28713f42214434d22b3 Mon Sep 17 00:00:00 2001
From: Firas Altayeb <tayebfiras@gmail.com>
Date: Fri, 6 Nov 2020 15:33:25 +0900
Subject: [PATCH 1/2] added a file for fork testing

---
 foo9 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 foo9

diff --git a/foo9 b/foo9
new file mode 100644
index 0000000..5502124
--- /dev/null
+++ b/foo9
@@ -0,0 +1 @@
+info

From 36717421dfdd63b41fcc52eaa6ac93a38d6134c7 Mon Sep 17 00:00:00 2001
From: Firas Altayeb <tayebfiras@gmail.com>
Date: Fri, 6 Nov 2020 15:51:22 +0900
Subject: [PATCH 2/2] added the code I wrote for the first report

---
 Challange_three.java | 77 ++++++++++++++++++++++++++++++++++++++++++++
 foo9                 |  1 -
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 Challange_three.java
 delete mode 100644 foo9

diff --git a/Challange_three.java b/Challange_three.java
new file mode 100644
index 0000000..4d1a064
--- /dev/null
+++ b/Challange_three.java
@@ -0,0 +1,77 @@
+import java.util.Scanner;
+
+public class Challange_three {
+	
+	public static int numberOfcycles = 0;
+	
+    public static void main(String[] args) {
+		//hunk change
+		//hunk change
+		//hunk change
+		//hunk change
+		//hunk change
+    	System.out.println("Enter your desired number: ");
+    	Scanner scanner = new Scanner(System.in);
+    	int number = scanner.nextInt();  
+    	
+    	long recursiveStart = System.nanoTime();
+    	recursiveCollatz(number);      
+        long recursiveEnd = System.nanoTime();
+        
+        //this separates the two run's results 
+        numberOfcycles = 0;
+        
+    	long iterativeStart = System.nanoTime();
+    	iterativeCollatz(number);      
+        long iterativeEnd = System.nanoTime();
+             
+        System.out.println("Recursive run took " + 
+        (recursiveEnd - recursiveStart)/1000 + " microseconds"); 
+        System.out.println("Iterative run took " + 
+        (iterativeEnd - iterativeStart)/1000 + " microseconds"); 
+
+        scanner.close();
+    }
+
+    public static void recursiveCollatz(int n) {
+		//don't change
+		//don't change
+		//don't change
+		//don't change
+    	//Prints 5 results each line
+    	if(numberOfcycles%8 == 0) {
+    		System.out.println();
+    		System.out.print(n + " ");
+    	} else System.out.print(n + " ");
+    	
+    	numberOfcycles++;
+    	
+        if (n == 1) return;
+        else if (n % 2 == 0) recursiveCollatz(n / 2);
+        else recursiveCollatz(3*n + 1);
+    }
+	
+    public static void iterativeCollatz(int n) {
+		//conflict change main side 
+		//conflict change branch side 
+    	StringBuilder result = new StringBuilder();
+        while (n != 1) {        
+        	//Prints 5 results each line
+            if(numberOfcycles%8 == 0) {               
+                result.append("\n");
+        	}
+            result.append(n + " ");
+            numberOfcycles++;
+            
+            if (n % 2 == 0) {
+                n /= 2;
+            }  else {
+                n = (n * 3) + 1;
+            }
+        }
+        result.append(1);
+        System.out.println(result);
+    }
+	
+	
+}
diff --git a/foo9 b/foo9
deleted file mode 100644
index 5502124..0000000
--- a/foo9
+++ /dev/null
@@ -1 +0,0 @@
-info