Open
Conversation
alonitac
reviewed
Oct 23, 2022
| @@ -0,0 +1,114 @@ | |||
| Git Basics (commit, diff, branches) | |||
| =================================== | |||
alonitac
reviewed
Oct 23, 2022
|
|
||
| M app.py | ||
|
|
||
| Cherry picking |
alonitac
reviewed
Oct 23, 2022
| for example, if you'll pick a commit that is in progress and it was first introduced in an unpicked commit, | ||
| it won't apply until you'll fix the unordered pick | ||
|
|
||
| Changes in working tree and switch branches |
alonitac
reviewed
Oct 23, 2022
| Reset | ||
| ===== | ||
| 2. | ||
| 1. git resets the last commit, in our case .env changed |
Owner
There was a problem hiding this comment.
The file 10.txt should have changed, not .env
alonitac
reviewed
Oct 23, 2022
| ===== | ||
| 2. | ||
| 1. git resets the last commit, in our case .env changed | ||
| 2. git resets the index but not the working tree, it means that the files .env and config.json are unadded to index. |
Owner
There was a problem hiding this comment.
Again, files 9.txt and 10.txt should have changed. This is probably because forgot to switch to the correct branch. But regardless the specific files, the answer is correct
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
2 participants
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.
finished Git and Pycharm ex-1
thank you for extending the time for me