From e8bc7c67dab06271a7258b91f11e3eeaecb68d0c Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:52:14 +0200 Subject: [PATCH 1/2] Add a sample file for rebase and merge conflicts --- file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 file.txt diff --git a/file.txt b/file.txt new file mode 100644 index 0000000..7a12b3d --- /dev/null +++ b/file.txt @@ -0,0 +1 @@ +This is a very important feature of this project! \ No newline at end of file From 177128f637d508f8033c3c0712f5e078b19505eb Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:53:16 +0200 Subject: [PATCH 2/2] Add second branch modification --- file.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/file.txt b/file.txt index 7a12b3d..fd2a105 100644 --- a/file.txt +++ b/file.txt @@ -1 +1,5 @@ -This is a very important feature of this project! \ No newline at end of file +This is a very important feature of this project! + +This feature was approved by the big boss. + +This feature will be extended a lot in the future.