Open
Conversation
alonitac
reviewed
Oct 23, 2022
| @@ -0,0 +1,126 @@ | |||
| ----------------Git Basics (commit, diff, branches)---------------- | |||
alonitac
reviewed
Oct 23, 2022
| 4)merge branch 'feature/version2' into 'feature/lambda_migration' | ||
| (popup window conflict) | ||
|
|
||
| 5)First I click All to merge all changes (for which there is no any conflict) |
alonitac
reviewed
Oct 23, 2022
| 'Merge branch 'feature/version1' into feature/lambda_migration' | ||
| 'Merge branch 'feature/version2' into feature/lambda_migration' | ||
|
|
||
| --------------------------cherry-pick------------------- |
alonitac
reviewed
Oct 23, 2022
| 5)The reason it is important to use cherry-pick in the correct order | ||
| because commits, are related to each other. | ||
|
|
||
| --------Changes in working tree and switch branches------ |
alonitac
reviewed
Oct 23, 2022
|
|
||
| 6) I have checked out to the last branch and there are no changes. | ||
|
|
||
| ------------------------Reset----------------------- |
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.
No description provided.