[Bug]: Github Resolver cannot push to the SAME PR

[xingyaoww]

Is there an existing issue for the same bug?

• I have checked the existing issues.

Describe the bug and reproduction steps

It happens when you follow-up a comment on a PR: #5181

See detailed Github action: https://github.com/All-Hands-AI/OpenHands/actions/runs/11959703763/job/33342073747#step:13:375

OpenHands Installation

Docker command in README

OpenHands Version

No response

Operating System

None

Logs, Errors, Screenshots, and Additional Context

No response

[enyst]

The relevant log shows that since 'git push' is not done by the agent, but by the resolver post-processing, it fails when the branch was modified on the remote:

Log

packages/openhands/resolver/send_pull_request.py", line 636, in main
process_single_issue(
File "/opt/hostedtoolcache/Python/3.12.7/x64/lib/python3.12/site-packages/openhands/resolver/send_pull_request.py", line 478, in process_single_issue
update_existing_pull_request(
File "/opt/hostedtoolcache/Python/3.12.7/x64/lib/python3.12/site-packages/openhands/resolver/send_pull_request.py", line 375, in update_existing_pull_request
Error: raise RuntimeError('Failed to push changes to the remote repository')

ERROR:root:<class 'RuntimeError'>: Failed to push changes to the remote repository
Copied repository to output/patches/pr_5181
Patch applied successfully
Git user configured as openhands
Error pushing changes: To https://github.com/All-Hands-AI/OpenHands.git
! [rejected] openhands-fix-issue-5179 -> openhands-fix-issue-5179 (fetch first)
error: failed to push some refs to 'https://github.com/All-Hands-AI/OpenHands.git'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

[xingyaoww]

@openhands-agent Check the issue history - Maybe you should modify the code to automatically git pull before git push - if it fails due to exit code non-zero, be sure to send an error message via Github comment.

[github-actions]

OpenHands started fixing the issue! You can monitor the progress here.

[github-actions]

This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.

[github-actions]

This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.

[github-actions]

This issue was closed because it has been stalled for over 30 days with no activity.