From 19a3ac603decd6a7647099d3024ad29f082f641e Mon Sep 17 00:00:00 2001
From: Jesse Duffield Duffield
 <jesseduffieldduffield@Jesses-MacBook-Pro-3.local>
Date: Sun, 24 Feb 2019 17:54:56 +1100
Subject: improve script for making a test repo

---
 test/repos/merge_conflict.sh | 51 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'test')

diff --git a/test/repos/merge_conflict.sh b/test/repos/merge_conflict.sh
index 9a8e9f442..ca3fb13b9 100755
--- a/test/repos/merge_conflict.sh
+++ b/test/repos/merge_conflict.sh
@@ -24,6 +24,57 @@ git add file1
 git add directory
 git commit -m "first commit"
 
+git checkout -b feature/cherry-picking
+
+echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1
+echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2
+
+git add .
+
+git commit -am "first commit freshman year"
+
+echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3
+
+git add .
+
+git commit -am "second commit subway eat fresh"
+
+echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4
+
+git add .
+
+git commit -am "third commit fresh"
+
+echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5
+
+git add .
+
+git commit -am "fourth commit cool"
+
+echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6
+
+git add .
+
+git commit -am "fifth commit nice"
+
+echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7
+
+git add .
+
+git commit -am "sixth commit haha"
+
+echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8
+
+git add .
+
+git commit -am "seventh commit yeah"
+
+echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9
+
+git add .
+
+git commit -am "eighth commit woo"
+
 
 git checkout -b develop
 echo "once upon a time there was a dog" >> file1
-- 
cgit v1.2.3