adanbh's solution for git_ex1 #27
Open
Conversation
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
alonitac
reviewed
Oct 23, 2022
| @@ -0,0 +1,47 @@ | |||
| 1. create a file in branch main, that called "abc.txt". | |||
| 2. the file color in Pycharm's Project view is green. | |||
Owner
There was a problem hiding this comment.
The file should be red since it's not in the index yet.
alonitac
reviewed
Oct 23, 2022
| 15. 1.git restore --staged abc.txt | ||
| 2.git status | ||
| ====================================== | ||
| Resolve conflicts |
alonitac
reviewed
Oct 23, 2022
| 6. yes, Untracked file feature/ | ||
| ====================================== | ||
| Cherry picking | ||
| 4. config.json , .env |
alonitac
reviewed
Oct 23, 2022
| 5. no | ||
| 6. no there is no take.txt in the branch ,Force Checkout button destroyed the file. | ||
| ======================================== | ||
| Reset |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.