Skip to content

Create, merge and fix merge requests through the agent on GitLab - #3

Open
HugoHeneault wants to merge 2 commits into
HugoHeneault/gitlab-3-readsfrom
HugoHeneault/gitlab-4-actions
Open

HugoHeneault wants to merge 2 commits into
HugoHeneault/gitlab-3-readsfrom
HugoHeneault/gitlab-4-actions

Conversation

@HugoHeneault

@HugoHeneault HugoHeneault commented Oct 8, 2026 •

Copy link
Copy Markdown

🤖 Généré par Claude Opus 5.5

Step 4 of 6. Part of a stack for GitLab support, issue 4 on spatie/bloom. Each PR targets the previous step, so its diff is that step alone. Nothing changes for a project on GitHub: the characterisation tests from step 1 are never edited by later steps.

Create, merge and fix conflicts through the agent on GitLab: GitLab defaults for the instructions (glab mr create ... --yes, glab mr merge --auto-merge=false --sha) and GitHub's prompts in GitLab's words, overrides under prompts.gitLab.<id>, !12 and merge request URLs on GitLab projects only, and the inspector naming the forge. GitHub's defaults and turns are unchanged and pinned.

GitLab projects get their own defaults: the merge request instructions
(glab mr create), the merge steps (glab mr merge --auto-merge=false
--sha), and GitHub's other prompts in GitLab's words. Overrides live
under prompts.gitLab.<id>, so a GitHub template never reaches a GitLab
project. GitHub's defaults, keys and turns are unchanged.

A workspace can start from !12 or a merge request URL, and the
inspector names the forge it is talking to.
Bloom's direct routes ran gh only, and merging directly is the default, so
a GitLab merge request would have gone to gh pr merge. GitLab now gets the
same routes through glab: create from the pushed commits, and merge the
confirmed head with --sha and --auto-merge=false.

glab's --rebase rebases and then refuses its own --sha, so a rebase runs
first and its new head is merged only if it replayed the confirmed commits.
The checks before a direct merge are shared, in GitHub's words for GitHub.
@HugoHeneault
HugoHeneault force-pushed the HugoHeneault/gitlab-4-actions branch from bf076c6 to 1f92471 Compare October 13, 2026 12:35
@HugoHeneault
HugoHeneault force-pushed the HugoHeneault/gitlab-3-reads branch from eb9757b to 7527cbe Compare October 13, 2026 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant