[bug] update branch by rebase/merge button does not work #13747

Open
opened 2025-11-02 10:52:03 -06:00 by GiteaMirror · 1 comment
Owner

Originally created by @mooleshacat on GitHub (Nov 23, 2024).

Description

I have been working on a branch for my project "dev-docker" and some changes were made to the development branch. Now on my PR page it shows the code is out of date and gives me the option to "update branch by merge" and "update branch by rebase" options.

I have tried both options, and neither of them seems to work. It will sit there spinning circles for about 1 minute, and then it reloads the PR page. When it reloads the PR page I scroll down and it shows the branch is still out of date, and still shows the "update code by merge" button.

I have tried both a merge and a rebase. Neither works. I also tried it with brave shields disabled, and with Opera, and neither works.

I have not yet tried updating the code by console using git. I prefer to use web client when I can.

I also have not yet tested this on gitea demo site, but I will try to now and update the ticket :)

Note: having issues simply logging in to demo.gitea.com - I've tried demo/demo but it does not work and the login I can't seem to find anywhere.

Screenshots

image

Gitea Version

1.22.3

Can you reproduce the bug on the Gitea demo site?

No - don't know what the login is for demo.gitea.com

Operating System

Windows (gitea runs in docker w/ Linux on a Linux machine)

Browser Version

Brave 1.71.123
Opera 114.0.5282.202

Originally created by @mooleshacat on GitHub (Nov 23, 2024). ### Description I have been working on a branch for my project "dev-docker" and some changes were made to the development branch. Now on my PR page it shows the code is out of date and gives me the option to "update branch by merge" and "update branch by rebase" options. I have tried both options, and neither of them seems to work. It will sit there spinning circles for about 1 minute, and then it reloads the PR page. When it reloads the PR page I scroll down and it shows the branch is still out of date, and still shows the "update code by merge" button. I have tried both a merge and a rebase. Neither works. I also tried it with brave shields disabled, and with Opera, and neither works. I have not yet tried updating the code by console using git. I prefer to use web client when I can. I also have not yet tested this on gitea demo site, but I will try to now and update the ticket :) Note: having issues simply logging in to demo.gitea.com - I've tried demo/demo but it does not work and the login I can't seem to find anywhere. ### Screenshots ![image](https://github.com/user-attachments/assets/4290abcb-bcc8-4ca6-b42d-4cf488ca9803) ### Gitea Version 1.22.3 ### Can you reproduce the bug on the Gitea demo site? No - don't know what the login is for demo.gitea.com ### Operating System Windows (gitea runs in docker w/ Linux on a Linux machine) ### Browser Version Brave 1.71.123 Opera 114.0.5282.202
GiteaMirror added the topic/uitype/bug labels 2025-11-02 10:52:03 -06:00
Author
Owner

@mooleshacat commented on GitHub (Nov 23, 2024):

Update: I have updated my branch by making a PR to pull development into dev-docker

Now the PR for merging dev-docker into development shows the code is updated (the button to update is now gone)

While this temporarily resolves the problem and allows me to continue working, I will likely run into the same issue again.

I would prefer to keep this open to resolve the issue anyways.
However if the gitea team want to close it and have me re-open it later if I encounter the issue again I would be OK with that :)

@mooleshacat commented on GitHub (Nov 23, 2024): **Update:** I have updated my branch by making a PR to pull development into dev-docker Now the PR for merging dev-docker into development shows the code is updated (the button to update is now gone) While this temporarily resolves the problem and allows me to continue working, I will likely run into the same issue again. I would prefer to keep this open to resolve the issue anyways. However if the gitea team want to close it and have me re-open it later if I encounter the issue again I would be OK with that :)
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#13747