bec/csaxs_bec
0
0
Fork 1
Code Issues 13 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

change xbpm1 to xbpm2 in optics hutch yaml file #83

Merged
diaz merged 1 commits from feat/correct_optics_hutch_yaml into main 2025-07-10 09:51:20 +02:00
Conversation 9 Commits 1 Files Changed 1 +2 -2
diaz commented 2025-07-07 17:54:49 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Change name of xbpm1 to xbpm2
We have got an error when adding the configuration in Bec. We would like to test this before merging

Change name of xbpm1 to xbpm2 We have got an error when adding the configuration in Bec. We would like to test this before merging
appel_c (Migrated from gitlab.psi.ch) approved these changes 2025-07-07 17:54:49 +02:00
diaz commented 2025-07-07 17:54:50 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

requested review from @diaz

requested review from @diaz
diaz commented 2025-07-07 17:54:50 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

assigned to @appel_c

assigned to @appel_c
diaz commented 2025-07-10 09:24:08 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

@appel_c I was checking that the motors still move after changing the name. We could merge now... Thanks!

@appel_c I was checking that the motors still move after changing the name. We could merge now... Thanks!
appel_c commented 2025-07-10 09:46:17 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

approved this merge request

approved this merge request
appel_c commented 2025-07-10 09:46:42 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

Cool, i’ll merge it

Cool, i’ll merge it
appel_c commented 2025-07-10 09:46:45 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

resolved all threads

resolved all threads
appel_c commented 2025-07-10 09:46:52 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

marked this merge request as ready

marked this merge request as **ready**
appel_c commented 2025-07-10 09:47:23 +02:00 (Migrated from gitlab.psi.ch)
Copy Link

added 2 commits

  • 6734143d - 1 commit from branch main
  • ef76e4b4 - change xbpm1 to xbpm2 in optics hutch yaml file

Compare with previous version

added 2 commits <ul><li>6734143d - 1 commit from branch <code>main</code></li><li>ef76e4b4 - change xbpm1 to xbpm2 in optics hutch yaml file</li></ul> [Compare with previous version](/bec/csaxs_bec/-/merge_requests/71/diffs?diff_id=46290&start_sha=9905d0e86c130437f382e5978441d79485c1e713)
appel_c (Migrated from gitlab.psi.ch) scheduled this pull request to auto merge when all checks succeed 2025-07-10 09:47:34 +02:00
appel_c (Migrated from gitlab.psi.ch) merged commit into main 2025-07-10 09:51:20 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
appel_c
Labels
Clear labels
issue::not confirmed
Used if an issue has not yet been confirmed by a developer
 issue::not reproducible
Used if an issue is not reproducible
 issue::reproducible
Used if a developer was able to reproduce the issue
 priority::critical
Should be done as soon as possible
 priority::needed
An important update to the code base
 priority::nice to have
Not really needed but a good improvement
 scope::backend
An issue regarding the backend services
 scope::frontend
An issue regarding the user-facing services
 stage::in development
This issue is currently being worked on
 stage::on hold
Something is blocking the development
 stage::pre_release
For issues that have been merged into a pre-release branch and are waiting for their release.
stage::ready for review
For issues that have been resolved and are ready for review
 stage::selected for development
This issue has been selected for development but has not been scheduled yet
 stage::weekly backlog
This issue has been selected for development for the next development cycle
 type::bug
It's a bug!
 type::discussion
A discussion is wanted/needed
 type::doc
Improvements to the documentation
 type::feature
A new feature
 type::improvement
Neither a feature nor a bug but an improvement to the code base
 type::test
Missing tests or improvements to the test suite
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
acerbo_a appel_c bec_bl_push-gitea bec-gitea celcer_t debenjak_l diaz divall_e guizar_m holler lombosi_c menzel perl_d stubbs_s usov_i wakonig_k wang_x1 wyzula_j zamofing_t
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: bec/csaxs_bec#83
Delete Branch "feat/correct_optics_hutch_yaml"

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?