Skip to content

Create and modify helloworld.py file #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntnamctu wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Create and modify helloworld.py file #18

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ccc1d2b
Add helloworld.py file
ntnamctu Sep 23, 2024
4c6d7be
Modify helloworld.py file
ntnamctu Sep 23, 2024
ea499ee
Modify helloworld.py file
ntnamctu Sep 23, 2024
b6cf3ba
Modify helloworld.py file
ntnamctu Sep 23, 2024
574792e
Modify helloworld.py file
ntnamctu Sep 23, 2024
41f7d46
merged branch into master
ntnamctu Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions helloworld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/python3
print("Hello World")
print("Hello Git")
Copy link
Author

@ntnamctu ntnamctu Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the first modify in the helloworld.py file.

print("Hello OSS Development")
Copy link
Author

@ntnamctu ntnamctu Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After switching to the new branch, test_functions, I added this line and then merged it into master.

print("Hello CTU")
Copy link
Author

@ntnamctu ntnamctu Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After merging i added this line to the code. Now we are in master.

print("Hello CTU - CICT")
Copy link
Author

@ntnamctu ntnamctu Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then i went back to test_functions branch, added a new line, committed then went back to master and merged again. But it had conflicts here. I fixed the conflicts and committed them then pushed them up.