From e8bc7c67dab06271a7258b91f11e3eeaecb68d0c Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:52:14 +0200 Subject: [PATCH 1/6] 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/6] 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. From ad24e7fa85bb06af0e58e4cf7a6dededd53f7e7c Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:52:14 +0200 Subject: [PATCH 3/6] 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 9513f6018266f3acc7bdfb856f28d979cd45e3c4 Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:54:00 +0200 Subject: [PATCH 4/6] Add changes on the first branch --- file.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/file.txt b/file.txt index 7a12b3d..f8f28a2 100644 --- a/file.txt +++ b/file.txt @@ -1 +1,3 @@ -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 will not be changed in the near future! From 7c577689b3b8d85207b8dcbc063963860e7e828d Mon Sep 17 00:00:00 2001 From: Cristian Vijelie Date: Mon, 20 Mar 2023 11:53:16 +0200 Subject: [PATCH 5/6] Add second branch modification --- file.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/file.txt b/file.txt index f8f28a2..a4d5430 100644 --- a/file.txt +++ b/file.txt @@ -1,3 +1,8 @@ This is a very important feature of this project! + This feature will not be changed in the near future! + +This feature was approved by the big boss. + +This feature will be extended a lot in the future. From 33b6df6a5381bccdf35d9bcd0acf0a621f478034 Mon Sep 17 00:00:00 2001 From: mihaelul Date: Wed, 25 Mar 2026 11:10:37 +0200 Subject: [PATCH 6/6] rezolvare exercitiu --- program.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 program.cpp diff --git a/program.cpp b/program.cpp new file mode 100644 index 0000000..2c49f6a --- /dev/null +++ b/program.cpp @@ -0,0 +1,9 @@ +#include +using namespace std; +int main() +{ + int x; + cin >> x; + + return x+5; +} \ No newline at end of file