Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR addresses an issue where the functionality responsible for resolving pull request conflicts was not correctly updating the local branch with the latest remote changes.
- Added a "git pull origin master" command in tests to simulate fetching the latest remote branch.
- Introduced a new update_branch method in the git handler and integrated it into the publish utility to update the branch before checkout.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| tests/plugins/github/resolve/test_resolve_pull_request.py | Added a git pull command to ensure tests fetch the latest remote branch. |
| src/plugins/github/plugins/publish/utils.py | Updated the branch before checkout by adding a call to handler.update_branch. |
| src/plugins/github/handlers/git.py | Added an update_branch method to execute a git pull for the specified branch. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## main #384 +/- ##
=======================================
Coverage 93.67% 93.67%
=======================================
Files 41 41
Lines 2276 2278 +2
=======================================
+ Hits 2132 2134 +2
Misses 144 144 ☔ View full report in Codecov by Sentry. |
he0119
approved these changes
May 10, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.