git exercise daniel malka #30
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
| 5. no | ||
| 6. force checkout let you switch to another branch even if you did not stage your changes but makes a local copy of the file. | ||
|
|
||
| # Reset |
alonitac
reviewed
Jul 18, 2022
| # Changes in the working tree and switch branches | ||
| 1. git branch -a shows we are in feature/lambda_migration2 | ||
| 2. create a new file: echo "newfile" > take.txt then add it to the index git add take.txt | ||
| 3. the error we got is because we didn't commit take.txt, there are 2 approaches - to commit the changes or stash them. to stash a change is to temporarily save it without the need to commit it, so you can work on another branch and get back to it later. |
alonitac
reviewed
Jul 18, 2022
| 2. git tab > log > double click on lambda_migration | ||
| 3. select reconnect() commit and click on cherry-picking, then on restrict extensions and click on cherry-picking | ||
| 4. two files: app.py and config.json | ||
| 5. the cherry-picking order matters since if we will go back to an older commit the newer will not be available |
alonitac
reviewed
Jul 18, 2022
| 2. red | ||
| 3. after git add command on abc.txt - the color changed to green | ||
| 4. echo "2" >> abc.txt | ||
| 5. the color changed to red again (using git status command) |
Owner
There was a problem hiding this comment.
The color should be blue (the question refer to PyCharm's project view, not to git)
alonitac
reviewed
Jul 18, 2022
| 5. the color changed to red again (using git status command) | ||
| 6. use the command git diff | ||
| 7. because we did not add the changes in abc.txt to the index | ||
| 8. because there is no branch called stage2 |
alonitac
reviewed
Jul 18, 2022
| 2. create and switch to the new branch: git checkout -b feature/lambda_migration | ||
| 3. merge feature/version1 to feature/lambda_migration and observe the merged changes using: git merge feature/version1 | ||
| 4. using PyCharm - select git > merge > feature/version2 | ||
| 5. select app.py and click merge > click on all to show all files > use annonate git blame on both version and accept left (port 8081) |
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.