lhumina_code/hero_compute
0
0
Fork 0
Code Issues 6 Pull requests Projects Releases 9 Packages Wiki Activity Actions 1

fix: resolve merge conflicts in hero_compute_server #95

Merged
mahmoud merged 3 commits from development_fix_resolve_merge_conflicts into development 2026-04-20 08:33:40 +00:00
Conversation 0 Commits 3 Files changed 2 +17 -53
zaelgohary commented 2026-04-16 18:10:56 +00:00
Member
Copy link

Fixes #94

Summary

  • Resolve merge conflict markers in 3 files
  • Keep incoming version

Test plan

  • cargo build --release passes
Fixes #94 ## Summary - Resolve merge conflict markers in 3 files - Keep incoming version ## Test plan - [x] cargo build --release passes
fix: resolve merge conflicts in hero_compute_server
All checks were successful
Test / test (push) Successful in 1m57s
Details
Test / test (pull_request) Successful in 1m55s
Details
6c789a1f19 
Resolve merge conflict markers in constants.rs, osis_server_generated.rs,
and tests.rs that were committed to the development branch.
Merge branch 'development' into development_fix_resolve_merge_conflicts
Some checks failed
Test / test (pull_request) Has been cancelled
Details
Test / test (push) Has been cancelled
Details
ffb1d8de1b
Merge branch 'development' into development_fix_resolve_merge_conflicts
All checks were successful
Test / test (push) Successful in 2m55s
Details
Test / test (pull_request) Successful in 2m58s
Details
d0381e9406
mahmoud merged commit be6bae1d7a into development 2026-04-20 08:33:40 +00:00
mahmoud deleted branch development_fix_resolve_merge_conflicts 2026-04-20 08:33:44 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
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
Projects
Clear projects
No items
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
lhumina_code/hero_compute!95
No description provided.