buddy-workbench 0.2.7 → 0.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/routes/pr-conflicts.js +6 -1
- package/ui/dist/assets/index-CR2sU8VH.js +623 -0
- package/ui/dist/assets/index-K8FGtNlV.css +1 -0
- package/ui/dist/assets/{xmindAdapter-DM4H30eS.js → xmindAdapter-DP0UYxfN.js} +1 -1
- package/ui/dist/index.html +2 -2
- package/ui/dist/sw.js +2 -2
- package/ui/dist/assets/index-Dv1qUQBz.js +0 -622
- package/ui/dist/assets/index-WSrJs_wh.css +0 -1
package/package.json
CHANGED
|
@@ -542,9 +542,14 @@ router.post('/resolve', async (req, res) => {
|
|
|
542
542
|
let resolutionPrUrl = '';
|
|
543
543
|
if (createNewBranch) {
|
|
544
544
|
const createPrUrl = `https://${parsed.host}/rest/api/latest/projects/${encodeURIComponent(parsed.projectKey)}/repos/${encodeURIComponent(parsed.repositorySlug)}/pull-requests`;
|
|
545
|
+
const conflictFileSummary = files.map((file, index) => {
|
|
546
|
+
const filePath = validateRelativeFilePath(file.path);
|
|
547
|
+
const resolvedBranch = choices[file.path] === 'target' ? targetBranch : sourceBranch;
|
|
548
|
+
return `${index + 1}. \`${filePath}\` uses \`${resolvedBranch}\``;
|
|
549
|
+
}).join('\n');
|
|
545
550
|
const createPrResponse = await client.post(createPrUrl, {
|
|
546
551
|
title: commitMessage,
|
|
547
|
-
description: `Resolution Pull Request created from ${commitBranch}.\n\nThis branch resolves conflicts for Pull Request #${parsed.pullRequestId} (${sourceBranch} → ${targetBranch})
|
|
552
|
+
description: `Resolution Pull Request created from ${commitBranch}.\n\nThis branch resolves conflicts for Pull Request #${parsed.pullRequestId} (${sourceBranch} → ${targetBranch}).\n\n## conflict files\n\n${conflictFileSummary}`,
|
|
548
553
|
fromRef: {
|
|
549
554
|
id: `refs/heads/${commitBranch}`,
|
|
550
555
|
repository: { slug: parsed.repositorySlug, project: { key: parsed.projectKey } }
|