create-pr

Create a GitHub pull request

Create a GitHub Pull Request. The user also requests the following instructions for the creation of this Pull Request: "$ARGUMENTS". Ignore if empty.

Compare the changes between the branch in the user instructions or the current on and the main branch. Prioritize the branch provided in the user instructions if it exists.

Follow these rules to create the pull request content:

1. Take into account the user instructions if provided

2. When the user provides a branch name that it's different from the current one:

   • Do not run git checkout or running any command that changes the current user workspace. This is IMPORTANT
   • Use diff and log commands comparing the given branch and main
   • Do not run git push. Check if the given branch exists on the remote. If not, ask the user to push it manually and WAIT for his/her confirmation before continuing. This is IMPORTANT

3. Use a clear and concise title that summarizes the most relevant change in the pull request. The title follows the conventional commit format we use in this project.

   fix: manage invalid name error when creating a new task Refactor the git commands into a separate library

   Fix an issue

4. The pull request body must be informative, clear, and concise. Use a neutral language that explain the changes so users can quickly identify the changes in the pull request.

5. Do not include any checklist at the end

6. Do not include any "Created by Claude" comment at the end

7. Use GitHub markdown format in the body. For example, use the code blocks to show pieces of code, inline code blocks to highlight methods in paragraphs and list items, mermaid diagrams for complex pull requests, and tables when required.

8. Follow this template:

   Changes

   Enumerate the major and most important changes in the pull request. Keep the list clear, short and concise.

   Notes

   An optional section to indicate any other relevant information, major architectural change, future work, other changes that were not part of the task by were implemented in this pull request. You can also include a mermaid diagram if the changes are complex and a diagram might help to understand them.

   Changes

   • Added push() method to the Git class with support for setting upstream branches
   • Added remoteUrl() method to retrieve git remote URLs
   • Added uncommitedChanges() method to get list of uncommitted files
   • Refactored push command to use the Git library instead of direct spawnSync calls Improved error handling with consistent GitError exceptions
   • Updated push command to use new exit utility functions (exitWithError, exitWithSuccess, exitWithWarn)

   Notes

   Temporarily removed the Pull Request push feature to improve the overall process.

   Changes

   • Removed interactive conflict resolution prompts and manual resolution flow
   • Added comprehensive merge-related methods including mergeBranch(), getMergeConflicts(), abortMerge(), and continueMerge()
   • Better merge conflict detection and reporting

   Notes

   The merge command flow is now simpler, so the user does not need to provide many input to complete it.

   Here you have a diagram with the new flow:

   flowchart TD
   Start([rover merge taskId]) --> ValidateTaskId{Valid Task ID?}
   ValidateTaskId -->|No| Error1[Error: Invalid task ID]
   ValidateTaskId -->|Yes| LoadTask
   
   LoadTask --> CheckCompleted{Task Completed?}
   CheckCompleted -->|No| Error3[Error: Task not completed]
   CheckCompleted -->|Yes| CheckUncommitted{Has Uncommitted<br/>Changes in Main?}
   
   CheckUncommitted -->|Yes| Error5[Error: Commit or stash changes first]
   CheckUncommitted -->|No| CheckChanges{Has Worktree Changes<br/>or Unmerged Commits?}
   
   CheckChanges -->|No| Success1[✓ No changes to merge]
   CheckChanges -->|Yes| ConfirmMerge{User Confirms<br/>Merge?}
   
   ConfirmMerge -->|No| Cancelled[Merge Cancelled]
   ConfirmMerge -->|Yes| AttemptMerge[Merge Task Branch]
   
   AttemptMerge --> MergeResult{Merge<br/>Successful?}
   
   MergeResult -->|Yes| Success2[✓ Task Merged Successfully]
   MergeResult -->|No| [Notify user about errors]