Open and merge a pull request
A reviewed ticket can go two ways. It can merge into the base branch from inside Herdloom, or it can leave as a pull request and land through whatever review your repository already has.
Opening one
Section titled “Opening one”The landing actions sit at the bottom of the ticket drawer’s Review tab.
Create PR pushes the ticket branch and opens a pull request against the base branch, with the ticket’s title and description on it. The card moves to In PR.
A project whose repository has no remote shows Add a remote and Merge into main instead. Merging there happens in the main checkout and the card goes straight to Done. Adding a remote, or publishing the repository to GitHub, is one dialog from the project card.
The GitHub command line tool has to be installed and signed in for pull requests. The setup check says whether it is.
What the merge button tells you
Section titled “What the merge button tells you”A ticket in In PR has a Merge PR button in the drawer. Branch protection is honoured rather than fought: when a rule stands in the way, the button says which one instead of failing.
- A required review that has not been given.
- Checks that are failing, or still running.
- A pull request still marked draft.
- A conflict with the base branch.
Merging uses the first method the repository and its ruleset allow, so a repository that only permits squash merges gets a squash. An administrator on a repository whose rules allow bypass gets a separate Merge as admin action, kept apart from the ordinary one on purpose.
Merge refuses while a run is still active on the ticket.
After it opens
Section titled “After it opens”Herdloom checks open pull requests every minute.
A pull request that merges, whether from the drawer or from GitHub, moves its ticket to Done. One that is closed without merging sends the ticket back to In review, with its branch intact.
One that GitHub reports as conflicting on two consecutive checks parks the ticket in Needs you with an Update branch action. That merges the current base branch into the ticket branch, hands the merge to an agent if it conflicts, and pushes the result. The card shows the agent at work while it happens.
A chain of old branches that all touch the same file needs one Update branch round per neighbour that lands. Each round works; nothing does the rounds for you.
Letting the project merge
Section titled “Letting the project merge”The In PR row in Automation has one rule: merge when checks pass. It fires only when checks are green, nothing is pending and no branch protection stands in the way. A refusal waits fifteen minutes before asking GitHub again.
Bundle a release merges several branches at once instead of one at a time. Integrations is where a Jira issue can follow the pull request through In Review and Done.