fixes #38 Improve close comment in manual-merge.sh

[mattsgarlata]

Closes #38

Made with Cursor

[coderabbitai]

Walkthrough

The close comment message in manual-merge.sh was updated from a generic statement to include a direct URL reference to the script, providing readers with a clear link to understand how the merge conflict was resolved.

Changes

Cohort / File(s)	Summary
Comment Message Update manual-merge.sh	Updated GitHub issue close comment from generic message to include direct URL reference to the script for better issue resolution traceability.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title clearly and specifically describes the main change: improving the close comment in manual-merge.sh, and references the related issue #38.
Description check	✅ Passed	The description references the closed issue #38 and is related to the changeset, though minimal in detail.
Linked Issues check	✅ Passed	The PR successfully implements the requirement from issue #38: the close comment now includes a URL to the manual-merge.sh script as requested.
Out of Scope Changes check	✅ Passed	All changes are in scope and directly address the requirement in issue #38 to improve the close comment with a script URL.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

• 📝 Generate docstrings (stacked PR)
• 📝 Generate docstrings (commit on current branch)

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch issue-38-improve-close-comment

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

🧹 Nitpick comments (1)

manual-merge.sh (1)

169-169: LGTM — directly satisfies the issue requirement.

The comment now matches the exact example from issue #38 and gives readers a clear trail to the recovery script.

One optional consideration: the URL is hardcoded to /blob/main/manual-merge.sh. If the script is ever renamed or relocated, this link will silently go stale. A dynamic alternative would be to derive the URL at runtime:

gh CLI command to get remote repo URL

♻️ Optional: derive URL dynamically from the git remote

-    gh issue close "$issue" --comment "Fixed using https://github.com/SpiderStrategies/merge-bot/blob/main/manual-merge.sh" || log_warn "  Failed to close issue #$issue"
+    REPO_URL=$(gh repo view --json url -q '.url')
+    gh issue close "$issue" --comment "Fixed using ${REPO_URL}/blob/main/manual-merge.sh" || log_warn "  Failed to close issue #$issue"

This keeps the comment accurate if the repo is ever forked or the remote changes, without touching any control flow.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@manual-merge.sh` at line 169, Update the hardcoded URL used in the gh issue
close comment in manual-merge.sh so it’s derived at runtime instead of fixed to
/blob/main/manual-merge.sh: determine the repository web URL from the git remote
(e.g., via git remote get-url or gh repo view) and normalize it to an HTTPS
GitHub browser URL, append the current branch/path to reference manual-merge.sh,
then use that constructed URL in the gh issue close "$issue" --comment call;
adjust the variable name near the existing gh issue close invocation so the
script builds and injects the dynamic URL rather than the hardcoded one.

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In `@manual-merge.sh`:
- Line 169: Update the hardcoded URL used in the gh issue close comment in
manual-merge.sh so it’s derived at runtime instead of fixed to
/blob/main/manual-merge.sh: determine the repository web URL from the git remote
(e.g., via git remote get-url or gh repo view) and normalize it to an HTTPS
GitHub browser URL, append the current branch/path to reference manual-merge.sh,
then use that constructed URL in the gh issue close "$issue" --comment call;
adjust the variable name near the existing gh issue close invocation so the
script builds and injects the dynamic URL rather than the hardcoded one.

---

ℹ️ Review info

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f031ad0 and 2822ff6.

📒 Files selected for processing (1)

• manual-merge.sh

[jerryorr]

+1