homeworkGit_Lakhneva #40
Open
Conversation
This file contains 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
MarinaLakhneva
commented
Nov 25, 2023
•
MarinaLakhneva
commented
- Создала fork репозитория
- Сделала интерактивный rebase ветки make-me-friendly (только её коммитов, начиная с Add bubble sort), подчистив историю:
- Коммиты, начинающихся с Fix, перенесла к тем, к которым они относятся, и сделала fixup
- Удалила файл trash.bin из коммита Add bubbleSort
- Перенесла коммит про gitignore в начало
- Сделала мердж ветки merge-me в ветку make-me-friendly
- Сделала push получившейся ветки в свой клон репозитория (с использованием флага --force)
- Создала pull request
gooverdian
approved these changes
Nov 26, 2023
| @@ -2,6 +2,6 @@ | |||
|
|
|||
| В строке ниже будет конфликт, потому что в разных ветках были изменения, и git не может решить без нас, какие из них важнее | |||
|
|
|||
| Это исправленное содержимое ветки make-me-friendly <- Здесь будет конфликт | |||
| УРААА, мы все порешали, конфликт улажен! | |||
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.