LinuxVR_Adventure/lvra.gitlab.io
1
0
Fork 0
Code Issues 3 Pull Requests 10 Actions Packages Projects Releases Wiki Activity

Bsb2e baballonia guide update Mermaid block for hugo #154

Closed
kzdixon wants to merge 11 commits from bsb2e-baballonia-guide into main
pull from: bsb2e-baballonia-guide
merge into: LinuxVR_Adventure:main
Conversation 4 Commits 11 Files Changed 1 +71 -2
kzdixon commented 2025-10-18 14:17:26 -04:00 (Migrated from gitlab.com)
Copy Link

Adjusted based on https://gitlab.com/lvra/lvra.gitlab.io/-/merge_requests/148#note_2829885727.

Adjusted based on https://gitlab.com/lvra/lvra.gitlab.io/-/merge_requests/148#note_2829885727.
kzdixon commented 2025-10-18 14:18:04 -04:00 (Migrated from gitlab.com)
Copy Link

mentioned in merge request !148

mentioned in merge request !148
kzdixon (Migrated from gitlab.com) closed this pull request 2025-10-18 14:19:00 -04:00
hypevhs commented 2025-10-18 15:15:23 -04:00 (Migrated from gitlab.com)
Copy Link

@kzdixon The merge conflict here comes from the fact that you are pushing a branch that contains another copy of the edits that you already made in the previous MR. Does it give you the option to delete your branch so that you can make the edit to the shortcode, freshly atop main?

@kzdixon The merge conflict here comes from the fact that you are pushing a branch that contains another copy of the edits that you already made in the previous MR. Does it give you the option to delete your branch so that you can make the edit to the shortcode, freshly atop `main`?
kzdixon commented 2025-10-18 15:16:20 -04:00 (Migrated from gitlab.com)
Copy Link

The fork update system gitlab provides is a bit messy so I could just redo with a fresh repo.

The fork update system gitlab provides is a bit messy so I could just redo with a fresh repo.
kzdixon commented 2025-10-18 15:21:30 -04:00 (Migrated from gitlab.com)
Copy Link

New PR at https://gitlab.com/lvra/lvra.gitlab.io/-/merge_requests/150
apologies for the mess

New PR at https://gitlab.com/lvra/lvra.gitlab.io/-/merge_requests/150 apologies for the mess

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
MayaTheShy
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: LinuxVR_Adventure/lvra.gitlab.io#154
Delete Branch "bsb2e-baballonia-guide"

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?