From 40754261c52001282c0d557457a52ed23b349d2a Mon Sep 17 00:00:00 2001 From: Daniel shainfeld Date: Wed, 11 May 2022 20:30:49 +0300 Subject: [PATCH 1/4] start git ex1 --- 07_git_exercises/danishain_ex1/README | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 07_git_exercises/danishain_ex1/README diff --git a/07_git_exercises/danishain_ex1/README b/07_git_exercises/danishain_ex1/README new file mode 100644 index 00000000..e69de29b From 47f126bacd0ea9f5ba78ac82b99675a42786b9f0 Mon Sep 17 00:00:00 2001 From: Daniel shainfeld Date: Wed, 11 May 2022 22:39:03 +0300 Subject: [PATCH 2/4] start - git ex1 --- 07_git_exercises/danishain_ex1/README | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/07_git_exercises/danishain_ex1/README b/07_git_exercises/danishain_ex1/README index e69de29b..9f767076 100644 --- a/07_git_exercises/danishain_ex1/README +++ b/07_git_exercises/danishain_ex1/README @@ -0,0 +1,5 @@ +2. green +3. blue +5. regular (text it's white after add&commit) before commit is blue. +6. git status +7. \ No newline at end of file From 7af07d958ff88f2d9e4be41a09410bbdfa518a46 Mon Sep 17 00:00:00 2001 From: Daniel shainfeld Date: Fri, 20 May 2022 14:28:43 +0300 Subject: [PATCH 3/4] start - git ex1 - finish part2 --- 07_git_exercises/danishain_ex1/README | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/07_git_exercises/danishain_ex1/README b/07_git_exercises/danishain_ex1/README index 9f767076..fc2b8519 100644 --- a/07_git_exercises/danishain_ex1/README +++ b/07_git_exercises/danishain_ex1/README @@ -1,5 +1,29 @@ +...part 1 ... 2. green 3. blue -5. regular (text it's white after add&commit) before commit is blue. -6. git status -7. \ No newline at end of file +5. regular (text it's white after add&commit) before commit is green. +6. git deff +7. thr change that add new file +8. error: invalid option: --staged2 +9. git add avc.txt +11. git diff HEAD/master +12. echo >> abc.txt 3 +13. no , because I didn't commit in working tree +14. because unstage the changes in my index. + + +...part 2 ... + 1. git branch + 2. git checkout -b feature/lamda_migration + 3. git merge feature/version1 + 6. commit marge: + commit 7039afc5f06442e490bc202c1a47f2974be42c2c (HEAD -> feature/lambda_migration) + Merge: 1d07b58 5341a6b + Author: Daniel shainfeld + Date: Fri May 20 14:16:32 2022 +0300 + + Merge branch 'feature/version2' into feature/lambda_migration + + # Conflicts: + # app.py + From a525d22924e43f98fca8375d69b175e910ee9667 Mon Sep 17 00:00:00 2001 From: Daniel shainfeld Date: Wed, 25 May 2022 22:26:17 +0300 Subject: [PATCH 4/4] finish ex1 git --- 07_git_exercises/danishain_ex1/README | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/07_git_exercises/danishain_ex1/README b/07_git_exercises/danishain_ex1/README index fc2b8519..08628f1a 100644 --- a/07_git_exercises/danishain_ex1/README +++ b/07_git_exercises/danishain_ex1/README @@ -27,3 +27,15 @@ # Conflicts: # app.py +...part 3.. + +4. files: .env and config.json +5. no, because the commit saved to enother file and copy them . and also no have conflict. + +...part 4... +1. touch take.txt +2. git add take.txt +3. I got smart checkout or force checkout and I choose the force and added only wha was not +5. no +6. delete the file and from working tree/ +