Origin/git ex1/mkshamir

06_linux_ex2/response.txt

@@ -0,0 +1 @@
+{"serverVersion": "3.2", "sessionID": "28f07da4-c213-4e41-8ade-bfe1c178fa09", "serverCert": "-----BEGIN CERTIFICATE-----\nMIIFcTCCA1mgAwIBAgIUUWl6ztFzDZo2t3ryVtQljDb4uMowDQYJKoZIhvcNAQEL\nBQAwSDELMAkGA1UEBhMCSUwxETAPBgNVBAgMCFRlbC1Bdml2MRgwFgYDVQQKDA9E\nDXZPcHNKYW4yMiBMdGQxDDAKBgNVBAMMA0JvYjAeFw0yMjAzMTExNDM4NDlaFw0y\nMzAzMTExNDM4NDlaMEgxCzAJBgNVBAYTAklMMREwDwYDVQQIDAhUZWwtQXZpdjEY\nMBYGA1UECgwPRGV2T3BzSmFuMjIgTHRkMQwwCgYDVQQDDANCb2IwggIiMA0GCSqG\nSIb3DQEBAQUAA4ICDwAwggIKAoICAQDE8cWwZEm76PYms56y7pVuupYGaG7bB0qD\ntRbkOLkQ3lyRfczSqq5XnvmAGfBt5eumpA9pxRwfRg885lF1pMpzxXP13VFYls1h\nZhVH1G5Oo6QFiVigWkUC3aYwKF1sb7fdeL8nN76dXTt/J1SvyoQXMIi7GoD1hHuR\n4xpkYkDXsTqUksZzofX5YeLTaiYHGewvHHHJcDeOS6tYuljLeXhLIHqfUdTGUCaf\nnX4vXl+jQCzCJ7VMgalfS3KPxga2Jva31o66/oLfOW7q2PEXeIMz6pEjy+UWe7WS\nS49bhis2vJa7yb/eKGhakmyGsRWzTzPWF2bXttAopqkuir92SC1EHyVS/y9IZk3B\n0HeYw4aL1rVXluXZ15NWwLkVFL7CMPlG8D7w4ixqpqinH5qKeZbW3sP9hDaPh4Xj\nleie9yXEpzAKG+cwvdu0rDqoD/ZEos3DMljEKtAByELfCsINkJc6uP9AXTyYL+Fn\nRhAIiHGSx2M41HNOVsnFRuRGt/6l1Y9hwmAAaUMtE+e/l23ZDpPV7NzkSnKktKgE\nABfpqyw6Hp3VAKrcc6274iZb8c8l5oNOuZNy/YWB798BSwRJQd/AQ+TdCUm7Q9vv\nMFyflFq/kSyx7RXth0KG2KoK+1l8X27a3p1MIgbravlMx7kwd14q+AbOAdvt6wlq\nAfn7hk2VGQIDAQABo1MwUTAdBgNVHQ4EFgQURZ1LutzEIMtEzRMLHQMX66oYqlIw\nHwYDVR0jBBgwFoAURZ1LutzEIMtEzRMLHQMX66oYqlIwDwYDVR0TAQH/BAUwAwEB\n/zANBgkqhkiG9w0BAQsFAAOCAgEAfJ0jg/4DlCjppypOcu4jIeZ7lmP3eO9wMRbV\nNezGNVlQA9zmxwx+7Fa2kz2dAiZ62k6As7ri34BAfQyLp9fFzwwKiPiGVvU9uAaT\nm9IRum9GeE8U2EChw8NlxytCylmfe572a3tTsHGwqGoIt7owK/4acMLPQxpsRCyE\nju7R7nBbiwEf7Ntsu7LTQxmCqVnxG6SaYFI0Om79IbyKLxENb9niZ7a8OwSwQjKV\nwx4eCku78GSDpp1+Tjz7p/Qngc0LKX8+ab6sUtTRloVvmGXglIdlqGVCjT1j7POK\nsEEefsd/djBjEW4aPdCiuWix89dIVOFmG+kOzzLRFrdJFtt/t82vCpBbnoiOvq+C\nItGTS1BWcR08+TICZzEGHiLUB5Nz9KR6vcS4IqQ1NnUgOcPZTaQBJ3bGhXGsf1jL\nr9ghpkUtKClOn92796APW2KPcbzK2JoDks/xWoTKfIY91UMmFwxvPxVWpfuf49TB\nhRvkc2US336tgIyHmCA6RMYKXWhQD1wUMuCSVS6TDHzsyCCRxISDJodzSg/galdU\n6GeW4CGYE7LpUaIg7QiT2qwAW2ixt7pqyK0J0d9IM8rznGKWLHnQ9eRRnAUiYUBn\nccisKJ4lvKs4wE5pSNlOSs8RxrkmnfnOvetjFfZzLeIjcVGQPTlw3+0I1BEPRLEp\n/9DUjHE=\n-----END CERTIFICATE-----\n\n"}

07_git_exercises/mkshamir_ex1/README.txt

@@ -0,0 +1,143 @@
+preliminaries
+~~~~~~~~~~~~~
+
+git clone https://github.com/mkshamir/git_ex1
+
+Git Basics
+~~~~~~~~~~~
+
+1- touch abc.txt
+   echo 1 >> abc.txt
+   cat abc.txt
+   git status
+
+2- red
+
+3- git add abc.txt
+   now the color is green
+   git status
+   git commit -m "adding and editing abc.txt"
+   now the color is white
+   git status
+
+4- echo 2 >> abc.txt
+
+5- now the color is green again
+
+6- git diff HEAD..main (or just git diff main)
+
+7- the change to abc.txt was made. but it wasn't added to the index, and it wasn't committed to the workingtree.
+   'git diff --staged' shows the difference between the HEAD and the index. at this point there is no difference
+   so the command prints nothing.
+
+8- 'git diff staged2' prints an error for two reasons. firstly because there must be '--' before the name of the
+   index/commit we are comparing to, as a syntax convention. secondly because the path for a second staging act
+   between commits won't be called staged2 by default. the terminal doesn't recognize that name.
+
+9- git add abc.txt
+   git status
+
+10- 'git diff' prints all the merge conflicts. currently, there aren't any, so it prints nothing.
+
+11- git diff --staged main
+
+12- echo 3 >> abc.txt
+    cat abc.txt
+    git status
+
+13- 'git diff --staged' only shows +2 as the difference with HEAD, while 'git diff main' shows +2 and +3.
+    this is because both changes were made since last commit. but only +2 was added to the index.
+
+14- abc.txt shows up twice with 'git status' because there are both changes to be committed and to be staged.
+
+15- git restore --staged abc.txt
+
+resolve conflicts
+~~~~~~~~~~~~~~~~~
+
+17- git branch
+  bugfix/fix_readme_typo
+  bugfix/open_kibana_port
+  dev
+  feature/data_retention_policy
+  feature/elasticsearch_helm_chart
+  feature/upgrade_angular_version
+  feature/version1
+  feature/version2
+* main
+
+18- git checkout -b feature/lambda_migration
+
+19- git merge feature/version1
+
+20+21- merging and resolving feature/version2 into feature/lambda_migration using the Pycharm UI.
+
+22- git status
+    it's shown that 'app.py' is set to be committed now that the merge conflicts have been resolved.
+    also, 'abc.txt' is to be staged before committing.
+    git commit -m "adding app.py after resolving merge conflicts"
+
+cherry picking
+~~~~~~~~~~~~~~
+
+1- git checkout main
+   git checkout -b feature/lambda_migration2
+
+2+3- using the pycharm UI to cherry-pick specific commits from feature/lambda_migration branch.
+
+4- '.env' and 'config.json' were added as result of the cherry-picking.
+
+5- the order in which commits are picked matters, and I should care about it, because the commits build on top of each
+   other. it's possible that a commit that is ahead in the git history tree won't make sense unless an earlier commit
+   is picked first. moreover, if I pick commits in a backward order I might delete wanted progress.
+   also, the order in which I pick commits determines which commit will ultimately be the HEAD.
+
+changes in working tree and switch branches
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+22- using 'git status' it is shown that I'm on 'feature/lambda_migration2' branch (which isn't 'dev').
+
+23- touch take.txt
+    ls
+    echo "take your time, look around" >> take.txt
+    cat take.txt
+    git status
+    git add take.txt
+    git status
+
+24- git checkout dev
+    the solutions proposed by git terminal are committing or stashing before checking out.
+
+25- using the pycharm UI to force checkout into dev branch.
+
+26- 'take.txt' has a completely different text in it now that I've force checked out. (a b c)
+
+27- git checkout feature/lambda_migration2
+    'take.txt' no longer exists in this branch. it can be inferred that force checkout allows switching branches without
+    committing or stashing therefore causing the loss of progress.
+
+reset
+~~~~~
+
+25- git checkout reset_question
+    git status
+
+26- i. git reset --soft HEAD~1
+       git status
+       it appears that the last commit was undone. 10.txt is now a stage to be committed and also the last commit
+       was omitted from the Git UI.
+   ii. git reset --mixed HEAD~1
+       git status
+       once again the last commit was undone. only this time the changes aren't staged and are marked as untracked files.
+  iii. git reset --hard HEAD~1
+       git status
+       one more time the last commit was undone. but this time not only are the changes not staged they were completely
+       erased from the working tree.
+   vi. git revert HEAD~1
+       git status
+       this created a new commit which is a copy of the previous commit. this action altered the state of one file
+       and deleted another file all together.
+
+27- the meaning of the notation HEAD~1 is the number of commits to count down from the front end of the branch history.
+    the head is the most recent staging area and the tilda specifies the number of commits to count back from that
+    starting point.