sls/hla_framework_bd
0
1
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Handle simultaneous open feature/add-service-* branches #30

New Issue
Open
opened 2026-07-29 11:25:22 +02:00 by labrec_b · 1 comment
labrec_b commented 2026-07-29 11:25:22 +02:00
Member
Copy Link
Copy Source

How to deal with conflicting files?

Conflicts:

  • Port (Services Registry)
  • ServiceManagerUi

Maybe conflicts:

  • Iocs Overview
  • Master HLA names
  • Master subs

Potential solutions:

  • Merge to master right away, but add a delete service cli command
    • delete/undo of files mentioned above is risky / needs some thought
How to deal with conflicting files? Conflicts: - Port (Services Registry) - ServiceManagerUi Maybe conflicts: - Iocs Overview - Master HLA names - Master subs Potential solutions: - Merge to master right away, but add a delete service cli command - delete/undo of files mentioned above is risky / needs some thought
labrec_b added this to the Add new service milestone 2026-07-29 11:25:22 +02:00
labrec_b added this to the Benjamin Labrecque project 2026-07-29 13:37:24 +02:00
armborst_f commented 2026-07-29 13:56:35 +02:00
Owner
Copy Link
Copy Source
  • fix port number right away on master
  • no delete feature, i.e., ports blocked for ever
  • nr. of active services determined dynamically by git runner
    • i.e., summary files (e.g., Iocs Overview, Master HLA names, Master subs) should always be update by git runner depending on current state of all services
- fix port number right away on master - no delete feature, i.e., ports blocked for ever - nr. of active services determined dynamically by git runner - i.e., summary files (e.g., Iocs Overview, Master HLA names, Master subs) should always be update by git runner depending on current state of all services
armborst_f moved this to Selected for Development in Benjamin Labrecque on 2026-07-29 13:58:25 +02:00
labrec_b moved this to Backlog in Benjamin Labrecque on 2026-08-06 16:37:07 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
No items
No labels
Milestone
No items
No Milestone Add new service
Projects
Clear projects
No projects
Benjamin Labrecque
Backlog
Assignees
Clear assignees
armborst_f (armborst_f) kallestrup_j (kallestrup_j) labrec_b (labrec_b) maeder (maeder)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: sls/hla_framework_bd#30