Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
mooleshacat opened this issue Nov 23, 2024 · 0 comments
Open

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

mooleshacat opened this issue Nov 23, 2024 · 0 comments
Labels
topic/ui Change the appearance of the Gitea UI type/bug

Comments

@mooleshacat
Copy link

mooleshacat commented 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

@mooleshacat mooleshacat added topic/ui Change the appearance of the Gitea UI type/bug labels Nov 23, 2024
@mooleshacat
Copy link
Author

mooleshacat commented 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 up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

No branches or pull requests

1 participant