Git ex1/danishain #29
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
Jul 18, 2022
| @@ -0,0 +1,41 @@ | |||
| ...part 1 ... | |||
| 2. green | |||
Owner
There was a problem hiding this comment.
The file should appear red in PyCharm
alonitac
reviewed
Jul 18, 2022
| 2. green | ||
| 3. blue | ||
| 5. regular (text it's white after add&commit) before commit is green. | ||
| 6. git deff |
alonitac
reviewed
Jul 18, 2022
| 5. regular (text it's white after add&commit) before commit is green. | ||
| 6. git deff | ||
| 7. thr change that add new file | ||
| 8. error: invalid option: --staged2 |
Owner
There was a problem hiding this comment.
Not exactly. Because there is no branch called staged2
alonitac
reviewed
Jul 18, 2022
| 11. git diff HEAD/master | ||
| 12. echo >> abc.txt 3 | ||
| 13. no , because I didn't commit in working tree | ||
| 14. because unstage the changes in my index. |
Owner
There was a problem hiding this comment.
Because it has changes both in the index and working tree
alonitac
reviewed
Jul 18, 2022
|
|
||
| # Conflicts: | ||
| # app.py | ||
|
|
alonitac
reviewed
Jul 18, 2022
| ...part 3.. | ||
|
|
||
| 4. files: .env and config.json | ||
| 5. no, because the commit saved to enother file and copy them . and also no have conflict. |
Owner
There was a problem hiding this comment.
We should care about the order when using cherry pick
alonitac
approved these changes
Jul 18, 2022
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.