Tonby73/PIBD-11_Basalov_A.D_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-11.Basalov.A.D.LabWork08.Simple #15

Closed
Tonby73 wants to merge 6 commits from LabWork8 into LabWork7
pull from: LabWork8
merge into: Tonby73:LabWork7
Conversation 1 Commits 6 Files Changed 23 +631 -579
Tonby73 commented 2024-06-08 16:09:21 +04:00
Owner
Copy Link
No description provided.
Tonby73 added 23 commits 2024-06-08 16:09:22 +04:00
eegov commented 2024-06-08 21:51:49 +04:00
Owner
Copy Link

В настройках пула в качестве ветки назначения выставлять ветку от предыдущей лабораторной

В настройках пула в качестве ветки назначения выставлять ветку от предыдущей лабораторной
eegov changed target branch from main to LabWork7 2024-06-08 21:51:55 +04:00
eegov approved these changes 2024-06-08 21:53:41 +04:00
eegov left a comment
Owner
Copy Link

Имеются конфликты пула

Проверено

Имеются конфликты пула Проверено
ProjectElectricLocomotive/CollectionGenericObjects/ListGenericObjects.cs
@ -61,0 +62,4 @@
if(comparer != null)
{
for(int i = 0; i < Count; i++)
eegov commented 2024-06-08 21:52:55 +04:00
Owner
Copy Link

У списка есть метод Contains для проверки

У списка есть метод Contains для проверки
ProjectElectricLocomotive/Drawnings/DrawingLocomotiveEqutables.cs
@ -0,0 +41,4 @@
}
if (x is DrawningElectricLocomotive && y is DrawningElectricLocomotive)
{
if(((EntityElectricLocomotive) x.EntityLocomotive).AdditionalColor != ((EntityElectricLocomotive)y.EntityLocomotive).AdditionalColor)
eegov commented 2024-06-08 21:53:09 +04:00
Owner
Copy Link

Зачем неоднократные преобразования, что мешает сделать это один раз?

Зачем неоднократные преобразования, что мешает сделать это один раз?
eegov closed this pull request 2024-06-08 21:53:52 +04:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
eegov
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Tonby73/PIBD-11_Basalov_A.D_Simple#15
No description provided.
Delete Branch "LabWork8"

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?