From 72cf69dc40cf370f6102b808a8ffdeef70f00dcf Mon Sep 17 00:00:00 2001 From: Pseudogram Date: Sat, 25 Jan 2025 01:25:38 -0500 Subject: [PATCH 1/4] adding flip This is a PR that adds a bunch of dumb files into an old project --- flip.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 flip.txt diff --git a/flip.txt b/flip.txt new file mode 100644 index 0000000..bd95de1 --- /dev/null +++ b/flip.txt @@ -0,0 +1 @@ +flip From d8ccdd0f3657b3b508e13953ae131a34eff6da4a Mon Sep 17 00:00:00 2001 From: Pseudogram Date: Sat, 25 Jan 2025 01:25:38 -0500 Subject: [PATCH 2/4] additions to flip Summary: Test Plan: --- flip.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flip.txt b/flip.txt index bd95de1..6e31747 100644 --- a/flip.txt +++ b/flip.txt @@ -1 +1,4 @@ flip + +now these changes are dependent on flip existing already + From 856f6ac895b7a6dd3c8cb89da8bcb8ff9d92e055 Mon Sep 17 00:00:00 2001 From: Pseudogram Date: Sat, 25 Jan 2025 01:25:51 -0500 Subject: [PATCH 3/4] adding foo --- foo.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 foo.txt diff --git a/foo.txt b/foo.txt new file mode 100644 index 0000000..b0f7514 --- /dev/null +++ b/foo.txt @@ -0,0 +1,3 @@ +foo + +I added this after committing the original. From fc20e67225309d3232082a4072679f9038011eaa Mon Sep 17 00:00:00 2001 From: Pseudogram Date: Sat, 25 Jan 2025 01:25:51 -0500 Subject: [PATCH 4/4] adding bar --- bar.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bar.txt b/bar.txt index 3227c47..11e77ef 100644 --- a/bar.txt +++ b/bar.txt @@ -1,3 +1,4 @@ -rab +bar I'm trying to create a merge conflict with sapling. +I've added this after the fact too.