Repository navigation
fix(skills): resolve leftover merge markers and drop alpha hosts on v1.203 - #3841
RaduAna-Maria merged 2 commits into
Conversation
…nces (#3491) The #2387 rebase left four unresolved conflict blocks in local-metadata-regeneration-guide.md and operate/CAPABILITY.md. Where the sides disagree, keep the one SKILL.md already states: validate after refresh, never update-metadata. Where they do not overlap, keep both. Add the validate step the kept text pointed at but the list lacked. Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit 83bfc47)
…examples The #3792 cherry-pick (#3838) covers every other skill, but these four maestro-flow references were rewritten on main by #3624 and so fall outside it. Use the same <AUTHORITY_URL> login placeholder and a cloud.uipath.com example host. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Claude finished @RaduAna-Maria's task in 1m 51s —— View job PR Review: fix(skills): resolve leftover merge markers and drop alpha hosts on v1.203
SummaryCherry-picks the merge-marker fix from main (#3491) into Change-by-Change Review1.
|
| Area | Status | Notes |
|---|---|---|
| Frontmatter | OK | No frontmatter changes |
| E2E Tests | OK | No new capabilities; merge-marker cleanup and host replacement don't alter skill behavior |
| Skill Body | OK | No SKILL.md changes |
| References & Assets | OK | All six files are clean, merge markers fully resolved, alpha hosts replaced consistently |
| Repo Hygiene | OK | No new skill paths, no secrets, changes scoped to the two affected skills |
Issues for Manual Review
None found.
Conclusion
Clean, well-scoped fix. The merge-marker resolution in maestro-bpmn keeps the better text from each branch and the alpha-host replacements in maestro-flow are consistent with the pattern used across the rest of the repo (#3792/#3838). No issues found — approve.
Summary
Two fixes for
release/v1.203before cutting 1.203.1.1. Conflict markers in maestro-bpmn
#2387 (
feat(bpmn): derive package metadata with refresh) merged to main with unresolved<<<<<<</>>>>>>>blocks in two references:skills/uipath-maestro-bpmn/references/operate/CAPABILITY.mdskills/uipath-maestro-bpmn/references/shared/local-metadata-regeneration-guide.mdMain fixed this in #3491, but that fix landed after this branch was cut. This PR cherry-picks it (
git cherry-pick -x 83bfc473). It applied cleanly, and no conflict markers remain underskills/,skill-flavors/orpreview/.2.
alpha.uipath.comin maestro-flow#3838 (the #3792 cherry-pick) removes alpha/staging hosts from every other skill. These four maestro-flow files are not in it because main rewrote them in #3624:
references/author/greenfield.md,references/shared/cli-conventions.md: login example →uip login --authority "<AUTHORITY_URL>", the same wording fix(skills): remove alpha/staging UiPath hosts from customer-facing skills [PILOT-8517] #3792 usesreferences/author/plugins/inline-voice-agent/{planning,impl}.md: Phone numbers URL example →cloud.uipath.comOnce this PR and #3838 are both merged,
release/v1.203has noalpha.uipath.comorstaging.uipath.comhosts left in skills.🤖 Generated with Claude Code