github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-09 12:46:42 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Strange PR merge/diff issue #12745

New Issue
Open
opened 2025-11-02 10:19:40 -06:00 by GiteaMirror · 1 comment
GiteaMirror commented 2025-11-02 10:19:40 -06:00
Owner
Copy Link

Originally created by @yp05327 on GitHub (Mar 27, 2024).

Description

first commit is in main branch, and it says out-of-date with the base branch, then updated branch by merge
image

After that, the merge button is grey, and try to click create squash commit, but I got 500 error.
Didn't get the log, as the max lines of terminal is 1000.
Then tried again, it merged success:
image
image

Not sure whether it is a bug. Can't reproduce it again.

Gitea Version

latest

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

No response

How are you running Gitea?

build

Database

None

Originally created by @yp05327 on GitHub (Mar 27, 2024). ### Description first commit is in main branch, and it says out-of-date with the base branch, then updated branch by merge ![image](https://github.com/go-gitea/gitea/assets/18380374/4d0e4f54-1fb6-40dc-829e-ed3c255a509f) After that, the merge button is grey, and try to click `create squash commit`, but I got 500 error. Didn't get the log, as the max lines of terminal is 1000. Then tried again, it merged success: ![image](https://github.com/go-gitea/gitea/assets/18380374/0fe2c14e-b1ef-4cf5-9d68-dc8749e20889) ![image](https://github.com/go-gitea/gitea/assets/18380374/97974714-50ec-4c06-98e7-a7d808570d99) Not sure whether it is a bug. Can't reproduce it again. ### Gitea Version latest ### Can you reproduce the bug on the Gitea demo site? No ### Log Gist _No response_ ### Screenshots _No response_ ### Git Version _No response_ ### Operating System _No response_ ### How are you running Gitea? build ### Database None
GiteaMirror commented 2025-11-02 10:19:40 -06:00
Author
Owner
Copy Link

@yp05327 commented on GitHub (Mar 27, 2024):

Tried to reproduce it, but can not create some thing like this:

image
image

@yp05327 commented on GitHub (Mar 27, 2024): Tried to reproduce it, but can not create some thing like this: ![image](https://github.com/go-gitea/gitea/assets/18380374/a316a3df-8f9b-49a3-a91e-fad82549d858) ![image](https://github.com/go-gitea/gitea/assets/18380374/c73455b6-8bad-4448-82d8-3ebfc2e8f6ba)
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#12745
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?