From d730ebafa8396e40351a1397e3abcba18b6df339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Lord=C3=A3o?= Date: Mon, 3 Jun 2024 22:57:57 -0300 Subject: [PATCH 1/8] file3 added containing one line --- file3_onfork.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file3_onfork.txt diff --git a/file3_onfork.txt b/file3_onfork.txt new file mode 100644 index 0000000..4946a1a --- /dev/null +++ b/file3_onfork.txt @@ -0,0 +1 @@ +line #1 \ No newline at end of file From f50e0887f3ef86bd48f03ab574e4e520ec84ccf2 Mon Sep 17 00:00:00 2001 From: fernandolordao-minc Date: Tue, 4 Jun 2024 00:33:28 -0300 Subject: [PATCH 2/8] file2 changed by forked repo --- file2.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/file2.txt b/file2.txt index df8a189..c4a14eb 100644 --- a/file2.txt +++ b/file2.txt @@ -1,2 +1,3 @@ line #1 -line #2 \ No newline at end of file +line #2 +line #3 included in forked repo \ No newline at end of file From 4e3700867efbfc1c3fe2a81ae466da0a9e64e63f Mon Sep 17 00:00:00 2001 From: fernandolordao-minc Date: Tue, 4 Jun 2024 00:37:33 -0300 Subject: [PATCH 3/8] added line #2 on file3 --- file3_onfork.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/file3_onfork.txt b/file3_onfork.txt index 4946a1a..df8a189 100644 --- a/file3_onfork.txt +++ b/file3_onfork.txt @@ -1 +1,2 @@ -line #1 \ No newline at end of file +line #1 +line #2 \ No newline at end of file From 1f8a95aba762b23c630278eebfdc8debdfa6dfce Mon Sep 17 00:00:00 2001 From: fernandolordao-minc Date: Tue, 4 Jun 2024 17:25:41 -0300 Subject: [PATCH 4/8] fixing file2 line #2 --- file2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file2.txt b/file2.txt index 56ce0f0..f1f2faf 100644 --- a/file2.txt +++ b/file2.txt @@ -1,4 +1,4 @@ line #1 -line #2 +line #2 fixing this line line #3 line #4 \ No newline at end of file From d471f5c6cd9f9f6adeb79e93d91c20266e546c27 Mon Sep 17 00:00:00 2001 From: fernandolordao-minc Date: Tue, 4 Jun 2024 17:30:14 -0300 Subject: [PATCH 5/8] system evolution --- file2.txt | 2 +- file4.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/file2.txt b/file2.txt index f1f2faf..dad45b4 100644 --- a/file2.txt +++ b/file2.txt @@ -1,4 +1,4 @@ line #1 line #2 fixing this line -line #3 +line #3 mere change line #4 \ No newline at end of file diff --git a/file4.txt b/file4.txt index df8a189..55c1de8 100644 --- a/file4.txt +++ b/file4.txt @@ -1,2 +1,2 @@ line #1 -line #2 \ No newline at end of file +line #2 just change \ No newline at end of file From 9401807076ed65c1d8d9492f7c66afdfdb6f77bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Lord=C3=A3o?= Date: Fri, 12 Jul 2024 22:20:18 -0300 Subject: [PATCH 6/8] Update file2.txt --- file2.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file2.txt b/file2.txt index 850931e..a4b8d83 100644 --- a/file2.txt +++ b/file2.txt @@ -1,4 +1,4 @@ line #1 -line #2 fixing this line +line #2 fixing (included in fork) this line line #3 included in forked repo & mere change -line #4 \ No newline at end of file +line #4 From 98473b0110c57c093245386810e14f855d04477d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Lord=C3=A3o?= Date: Wed, 31 Jul 2024 13:51:27 -0300 Subject: [PATCH 7/8] new commit in "main" branch --- file4.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/file4.txt b/file4.txt index 4aa026d..c467bca 100644 --- a/file4.txt +++ b/file4.txt @@ -1,3 +1,4 @@ line #1 line #2 just change line #3 +line #4 \ No newline at end of file From 1ec449dc8e5f604e8484ecaa85616346f48fd176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Lord=C3=A3o?= Date: Fri, 29 Nov 2024 14:32:30 -0300 Subject: [PATCH 8/8] Update file2.txt --- file2.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/file2.txt b/file2.txt index f7f2fa4..0d01feb 100644 --- a/file2.txt +++ b/file2.txt @@ -1,5 +1,5 @@ line #1 line #2 (included in upstream) fixing (included in fork) this line -line #3 included in forked repo & mere change (included during merge conflict resolution) +line #3 included in forked repo & mere change (included during merge conflict resolution) (new change nov29 fork) line #4 - +line #5 included in forked repo (nov29)