From 7e80d9ae38b9422d0d9f744ee0b33ba1ac27b10b Mon Sep 17 00:00:00 2001 From: masquerain0601 Date: Mon, 9 Oct 2023 17:05:57 +0200 Subject: [PATCH 1/5] sto cercando di capire se ho fatto un merge della dev su master oppure no OwO --- my_program.py | 1 + 1 file changed, 1 insertion(+) diff --git a/my_program.py b/my_program.py index 91136ac..96b0193 100644 --- a/my_program.py +++ b/my_program.py @@ -1 +1,2 @@ print ("Hello Word :3") +print ("I'm trying to understand the branches") From 929716aee9c2486ba720e6ab86fd5941bfb33df3 Mon Sep 17 00:00:00 2001 From: masquerain0601 Date: Mon, 9 Oct 2023 17:12:55 +0200 Subject: [PATCH 2/5] modificato il README per il branch dev --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index b7492f5..31f9879 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,4 @@ Hello World :3 -ho capito lo stash, wiiiiiiiiiiii - -test per vedere come lo status vede il file prima e dopo l'add +Attualmente mi trovo sulla branch dev From 09dcaa62d32f600061c5b6b17e7a9304ac58e8d0 Mon Sep 17 00:00:00 2001 From: masquerain0601 Date: Mon, 9 Oct 2023 17:31:02 +0200 Subject: [PATCH 3/5] modificato .py per capire come funziona HEAD --- my_program.py | 1 + 1 file changed, 1 insertion(+) diff --git a/my_program.py b/my_program.py index 96b0193..af9e2d9 100644 --- a/my_program.py +++ b/my_program.py @@ -1,2 +1,3 @@ print ("Hello Word :3") print ("I'm trying to understand the branches") +print ("trying to undestand hoe HEAD works") From ffca97dad11335e612feff29022ae971ba8549e8 Mon Sep 17 00:00:00 2001 From: masquerain0601 Date: Mon, 9 Oct 2023 20:55:11 +0200 Subject: [PATCH 4/5] aggiunta cose --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 31f9879..785fd8c 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ Hello World :3 Attualmente mi trovo sulla branch dev + +Questa è una modifica che sto facendo sul file \ No newline at end of file From 3a549d9d9e8f8fd8a53fde39bcc221dfb7343294 Mon Sep 17 00:00:00 2001 From: masquerain0601 Date: Mon, 9 Oct 2023 21:15:36 +0200 Subject: [PATCH 5/5] modifca per conflitto --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 785fd8c..8a22ab0 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ Hello World :3 Attualmente mi trovo sulla branch dev -Questa è una modifica che sto facendo sul file \ No newline at end of file +Modifica pushata