From b8587aab483aac23edaefbc3ddbd9d35022595d2 Mon Sep 17 00:00:00 2001 From: ilyaborodin Date: Sat, 30 Nov 2019 16:10:23 +0300 Subject: [PATCH 1/4] initial_commit --- main.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 main.py diff --git a/main.py b/main.py new file mode 100644 index 0000000..44159b3 --- /dev/null +++ b/main.py @@ -0,0 +1 @@ +print("Hello world") From 95163fa602549715d926188eeb062738eee300c5 Mon Sep 17 00:00:00 2001 From: ilyaborodin Date: Sat, 30 Nov 2019 16:14:33 +0300 Subject: [PATCH 2/4] owner_name --- main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 44159b3..f0157aa 100644 --- a/main.py +++ b/main.py @@ -1 +1,4 @@ -print("Hello world") +print('Enter your name:') +x = input() +print('Hello, ' + x) +print('How is the weather today?') From ba364a48bacbbade427a5b9ebcdd5bd668dce6d3 Mon Sep 17 00:00:00 2001 From: ilyaborodin Date: Sat, 30 Nov 2019 16:19:25 +0300 Subject: [PATCH 3/4] add_adjective --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 44159b3..7e8bc05 100644 --- a/main.py +++ b/main.py @@ -1 +1 @@ -print("Hello world") +print("Hello brave new world") From 414633d4fb56e63ab4a5bf4d739654cc68b935ae Mon Sep 17 00:00:00 2001 From: ilyaborodin Date: Sat, 30 Nov 2019 17:50:32 +0300 Subject: [PATCH 4/4] init .gitignore --- .gitignore | 1 + README | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 .gitignore create mode 100644 README diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..76ce7fc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.jpg diff --git a/README b/README new file mode 100644 index 0000000..9e29651 --- /dev/null +++ b/README @@ -0,0 +1,15 @@ +git #2 homework + +1. Create github account if or use existing one if any. +2. Make a fork from repository https://github.com/introduction-to-python-bsuir-2019/GitHomework +3. Add your fork as a remote to your repo from git #1 homework. +4. Set newly added remote as tracking branch to the local master branch. +5. Rebase master to fork remote (origin/master by default). Hint: resulting master branch should include README from upstream repo. +6. Reset master to the state previous to final merge from git #1 homework. Hint: resulting master shouldn’t include any changes from owner_name. +7. Switch to the owner_name branch. +8. Rebase owner_name to the master. +9. Add .gitignore file that ignores jpg files as a separate commit. +10. Revert the last commit (the one with gitignore changes). +11. Merge owner_name branch back to master. +12. Push master to the fork master. +12. Send PR from fork master to the https://github.com/introduction-to-python-bsuir-2019/GitHomework repository master. Provide your name and email in PR description.