Alexey/DAS_2024_1
2
7
Fork 2
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

dozorova_alena_lab_6 #76

Merged
Alexey merged 6 commits from dozorova_alena_lab_6 into main 2024-10-26 11:27:22 +04:00
Conversation 3 Commits 6 Files Changed 9 +207
DozorovaA.A commented 2024-10-19 12:28:33 +04:00
Collaborator
Copy Link
No description provided.
DozorovaA.A added 4 commits 2024-10-19 12:28:33 +04:00
DozorovaA.A requested review from Alexey 2024-10-19 12:28:47 +04:00
Alexey commented 2024-10-19 13:15:30 +04:00
Owner
Copy Link

Тут что-то merge-конфликт нарисовался)

Тут что-то merge-конфликт нарисовался)
DozorovaA.A added 1 commit 2024-10-19 13:17:14 +04:00
DozorovaA.A added 1 commit 2024-10-19 13:17:35 +04:00
Alexey requested changes 2024-10-19 13:18:00 +04:00
dozorova_alena_lab_6/.gitignore
@ -0,0 +7,4 @@
/dozorova_alena_lab_2/ConsoleApp2/.vs
/dozorova_alena_lab_2/ConsoleApp2/bin
/dozorova_alena_lab_2/ConsoleApp2/obj
/dozorova_alena_lab_6/ConsoleApp1/.vs
Alexey commented 2024-10-19 13:17:56 +04:00
Owner
Copy Link

В лабе есть какой-то merge-конфликт с основной веткой master. Нужно его починить

В лабе есть какой-то merge-конфликт с основной веткой ```master```. Нужно его починить
DozorovaA.A commented 2024-10-19 13:19:30 +04:00
Author
Collaborator
Copy Link

Решено, насколько вижу
image

Решено, насколько вижу ![image](/attachments/7117baf1-ca39-403f-9e26-5f1fab7812db)
image.png
7.2 KiB
Alexey commented 2024-10-26 11:27:19 +04:00
Owner
Copy Link

Принято!

Принято!
Alexey merged commit f46724e5cf into main 2024-10-26 11:27:22 +04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Alexey
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Alexey/DAS_2024_1#76
No description provided.
Delete Branch "dozorova_alena_lab_6"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?