lhumina_code/hero_db
23
0
Fork 0
Code Issues 1 Pull requests Projects Releases 1 Packages 2 Wiki Activity Actions

bug: merge conflict markers committed to development branch in hero_db_ui #20

New issue
Closed
opened 2026-04-16 18:07:51 +00:00 by zaelgohary · 0 comments
zaelgohary commented 2026-04-16 18:07:51 +00:00
Member
Copy link

Description

hero_db_ui/src/main.rs and web.rs contain unresolved merge conflict markers on the development branch, preventing compilation.

Fix

Resolve conflicts by keeping the incoming version which uses the new socket_dir() naming convention.

## Description hero_db_ui/src/main.rs and web.rs contain unresolved merge conflict markers on the development branch, preventing compilation. ## Fix Resolve conflicts by keeping the incoming version which uses the new socket_dir() naming convention.
mahmoud added this to the ACTIVE project 2026-04-16 18:21:45 +00:00
mahmoud added this to the now milestone 2026-04-16 18:21:49 +00:00
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
development
development_mik2
development_kristof
development_check
main
v0.3.2
v0.1.3
v0.1.2
v0.0.1
v0.1.1
v0.1.0
v0.0.1-rc1
Labels
Clear labels   
prio_critical

   
prio_low

   
type_bug

   
type_contact

   
type_issue

   
type_lead

   
type_question

   
type_story

   
type_task
No labels
prio_critical
prio_low
type_bug
type_contact
type_issue
type_lead
type_question
type_story
type_task
Milestone
Clear milestone
No items
No milestone
now
Projects
Clear projects
No items
No project
ACTIVE
Assignees
Clear assignees
No assignees
zaelgohary
1 participant
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
lhumina_code/hero_db#20
No description provided.