Create and modify helloworld.py file#18
Open
ntnamctu wants to merge 6 commits intotmtuanctu:masterfrom
Open
Conversation
ntnamctu
commented
Sep 23, 2024
ntnamctu
commented
Sep 23, 2024
| @@ -0,0 +1,6 @@ | |||
| #!/usr/bin/python3 | |||
| print("Hello World") | |||
| print("Hello Git") | |||
Author
There was a problem hiding this comment.
This is the first modify in the helloworld.py file.
ntnamctu
commented
Sep 23, 2024
| #!/usr/bin/python3 | ||
| print("Hello World") | ||
| print("Hello Git") | ||
| print("Hello OSS Development") |
Author
There was a problem hiding this comment.
After switching to the new branch, test_functions, I added this line and then merged it into master.
ntnamctu
commented
Sep 23, 2024
| print("Hello World") | ||
| print("Hello Git") | ||
| print("Hello OSS Development") | ||
| print("Hello CTU") |
Author
There was a problem hiding this comment.
After merging i added this line to the code. Now we are in master.
ntnamctu
commented
Sep 23, 2024
| print("Hello Git") | ||
| print("Hello OSS Development") | ||
| print("Hello CTU") | ||
| print("Hello CTU - CICT") |
Author
There was a problem hiding this comment.
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.