ADO PR流水线Git提交至源分支失败问题求助

背景 #

• 运维团队通过修改xlsx文件更新Azure资源配置
• 因xlsx文件变更在ADO中无法直观追踪，为在代码周期早期发现错误，开发了PR触发式流水线，同时支持分支手动触发

目标 #

当xlsx文件变更并创建PR时，自动执行以下流程：

• 拉取PR源分支
• 运行PowerShell脚本读取xlsx生成Bicep模板
• 将修改/新增的Bicep模板提交回PR分支

问题现象 #

• 手动触发流水线时可正常完成，文件变更能正确生成并显示
• PR触发时Git提交任务报错，错误日志如下：

Branch: refs/heads/test/bm/pr-fix
**checkout master**
error: pathspec 'master' did not match any file(s) known to git
From https://dev.azure.com/quest1/LoNaLo/_git/LoNaLo
branch            master     -> FETCH_HEAD
[new branch]      master     -> origin/master
fatal: refusing to merge unrelated histories
Already on 'test/bm/pr-fix'
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemacc.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemauthoracc.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemauthortst.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemtst.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumotheracc.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumothertst.bicep
M   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumtst.bicep
merge: main - not something we can merge
**status**
On branch test/bm/pr-fix
Changes not staged for commit:
>  (use "git add <file>..." to update what will be committed)
   (use "git restore <file>..." to discard changes in working directory)
Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git restore <file>..." to discard changes in working directory)
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemacc.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemauthoracc.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemauthortst.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumaemtst.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumotheracc.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumothertst.bicep
modified:   030-Security/frontdoorwaf/afdv2/templates/wafafdpremiumtst.bicep

no changes added to commit (use "git add" and/or "git commit -a")
**add**
**commit**
[test/bm/pr-fix 6b23f06] Update Branch refs/heads/test/bm/pr-fix with generated templates
7 files changed, 8 insertions(+), 7 deletions(-)
**pull refs/heads/test/bm/pr-fix**
From https://dev.azure.com/quest1/LoNaLo/_git/LoNaLo
branch            test/bm/pr-fix -> FETCH_HEAD
[new branch]      test/bm/pr-fix -> origin/test/bm/pr-fix
fatal: refusing to merge unrelated histories
**push**
To https://dev.azure.com/quest1/LoNaLo/_git/LoNaLo
[rejected]        test/bm/pr-fix -> test/bm/pr-fix (non-fast-forward)
error: failed to push some refs to 'https://dev.azure.com/quest1/LoNaLo/_git/LoNaLo'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
##[error]PowerShell exited with code '1'.

错误分析 #

从日志中可定位几个核心问题：

1. 分支名称不匹配：流水线尝试checkout master分支，但仓库默认分支可能为main，或该分支不存在
2. 无关历史合并：本地分支与远程分支无共同提交历史，导致合并操作被拒绝
3. 无效合并操作：尝试合并main分支，但当前分支与main分支历史断层，无法完成合并
4. 推送冲突：本地提交落后于远程分支，或历史不一致导致非快进推送被拒绝

解决方案建议 #

1. 修正分支名称配置 #

确认仓库实际默认分支（master/main），将流水线中所有master替换为正确的分支名

2. 优化PR分支拉取逻辑 #

PR触发时，ADO流水线默认已拉取PR源分支，无需手动checkout其他分支。调整Git步骤：

# 拉取远程源分支最新代码，避免历史冲突
git pull origin test/bm/pr-fix --rebase

3. 简化提交推送流程 #

移除不必要的合并操作，直接提交并推送：

# 暂存所有修改文件
git add .
# 提交修改（建议使用更清晰的提交信息）
git commit -m "Update generated Bicep templates from xlsx configuration"
# 推送回源分支
git push origin test/bm/pr-fix

4. 修复历史关联问题 #

若分支确实存在历史断层，可在创建PR前确保源分支基于默认分支最新版本创建；若必须合并无关历史，可添加--allow-unrelated-histories参数（不推荐，仅用于确认历史无关的场景）：

git merge main --allow-unrelated-histories

5. 配置流水线权限 #

确保ADO流水线服务账号拥有向PR源分支推送代码的权限：

• 在仓库设置中为流水线账号授予Contributor权限
• 检查PR分支保护规则，允许流水线账号直接推送

6. 调试Git环境 #

在流水线中添加步骤打印Git环境信息，确认分支、远程仓库配置：

git branch -a
git remote -v
git log --oneline -n 5

内容的提问来源于stack exchange，提问作者Ben M