uipath-source-control-conflicts

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Translation

Chinese

UiPath Source Control Conflicts

UiPath 源代码控制冲突

Preserve compatible intent, choose explicitly when intent conflicts, and finish with a structurally valid project instead of treating UiPath artifacts as undifferentiated text.

Maturity: pilot.

保留兼容的意图，当意图冲突时明确选择，最终得到结构有效的项目，而非将UiPath工件视为无差异文本。

成熟度: 试点阶段。

Ownership Boundary

所有权边界

This custom skill owns: Preserve compatible intent, choose explicitly when intent conflicts, and finish with a structurally valid project instead of treating UiPath artifacts as undifferentiated text.

Keep current product commands, schemas, artifact validation, live tenant operations, and policy administration with official UiPath skills.

此自定义Skill负责: 保留兼容的意图，当意图冲突时明确选择，最终得到结构有效的项目，而非将UiPath工件视为无差异文本。

当前产品命令、schema、工件验证、实时租户操作和策略管理仍由官方UiPath Skill负责。

Compose With Official UiPath Skills

与官方UiPath Skill组合使用

Use official skills for current product commands and artifact contracts:

```
uipath-rpa
```
```
uipath-agents
```
```
uipath-maestro-flow
```
```
uipath-maestro-bpmn
```
```
uipath-maestro-case
```
```
uipath-coded-apps
```
```
uipath-api-workflow
```
```
uipath-solution
```
```
uipath-review
```

针对当前产品命令和工件协议，使用官方Skill:

```
uipath-rpa
```
```
uipath-agents
```
```
uipath-maestro-flow
```
```
uipath-maestro-bpmn
```
```
uipath-maestro-case
```
```
uipath-coded-apps
```
```
uipath-api-workflow
```
```
uipath-solution
```
```
uipath-review
```

Workflow

工作流程

1. Inspect source-control state

1. 检查源代码控制状态

Identify merge or rebase mode, base, ours, theirs, conflicting files, generated files, relevant commits, and the command needed to continue.

Completion criterion: Every conflict and its source state is known.

识别合并或变基模式、基准版本、我方版本、对方版本、冲突文件、生成文件、相关提交以及需要继续执行的命令。

完成标准: 所有冲突及其源状态均已明确。

2. Recover both intents

2. 还原双方意图

Read commit messages, issues, SDD sections, tests, ADRs, and surrounding artifact structure. State what each side was trying to preserve.

Completion criterion: Each hunk has two evidence-backed intents or a documented unknown.

读取提交信息、问题、SDD章节、测试、ADR以及周边工件结构。说明每一方试图保留的内容。

完成标准: 每个代码块都有两个基于证据的意图，或已记录未知情况。

3. Choose a structure-aware strategy

3. 选择结构感知策略

Preserve both intents where compatible. When incompatible, follow the merge goal and approved specification. Prefer regeneration through the owning official skill for generated or structured artifacts when possible.

Completion criterion: The resolution strategy is explicit before editing each artifact.

在兼容的情况下保留双方意图。当意图不兼容时，遵循合并目标和已批准的规范。对于生成的或结构化的工件，尽可能优先通过所属官方Skill重新生成。

完成标准: 在编辑每个工件前，解决策略已明确。

4. Resolve without inventing behavior

4. 解决冲突且不新增行为

Edit only the conflicted behavior and necessary structural glue. Remove markers and avoid unrelated modernization.

Completion criterion: All conflict markers are gone and no new unapproved behavior was added.

仅编辑冲突行为和必要的结构衔接部分。移除冲突标记，避免无关的现代化修改。

完成标准: 所有冲突标记已清除，且未添加任何未经批准的新行为。

5. Validate by artifact owner

5. 由工件所有者验证

Run the official build, validation, tests, solution checks, and two-axis review required by every affected artifact type.

Completion criterion: The merged structure and behavior have observed evidence.

运行受影响的每种工件类型所需的官方构建、验证、测试、解决方案检查以及双向评审。

完成标准: 合并后的结构和行为有可观测的证据支持。

6. Finish safely

6. 安全完成

Stage resolved files and continue the merge or rebase. Commit, push, force-update, or open a PR only under the user's source-control authority and policy.

Completion criterion: The operation is complete or the exact remaining command and blocker are reported.

暂存已解决的文件并继续合并或变基操作。仅在用户的源代码控制权限和政策允许下执行提交、推送、强制更新或创建PR。

完成标准: 操作已完成，或已报告确切的剩余命令和阻塞点。

Output Contract

输出协议

Intent summary per conflict.
Resolved source artifacts.
Validation and test evidence.
Completed or precisely paused merge or rebase.

每个冲突的意图摘要。
已解决的源工件。
验证和测试证据。
已完成或精确暂停的合并/变基操作。

Guardrails

约束规则

Never resolve by taking ours or theirs blindly for structured artifacts.
Never invent business behavior to make a conflict disappear.
Never force-push or rewrite shared history without explicit authority.
Never claim success until the merge or rebase state and product validation are checked.

对于结构化工件，切勿盲目选择我方或对方版本来解决冲突。
切勿为消除冲突而新增业务行为。
未经明确授权，切勿强制推送或重写共享历史。
在检查合并/变基状态和产品验证之前，切勿宣称成功。

Example Requests

请求示例

"Resolve a project.json dependency conflict."
"Merge two branches that both changed Main.xaml."
"Recover a conflicted UiPath solution wrapper."

"解决project.json依赖冲突。"
"合并两个均修改了Main.xaml的分支。"
"恢复冲突的UiPath解决方案包装器。"

Finish

收尾

Report completed work, observed evidence, the next official owner, and every blocker. Mark unobserved actions as pending.

报告已完成的工作、观测到的证据、下一个官方负责人以及所有阻塞点。将未执行的操作标记为待处理。