github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-15 20:09:18 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

PRs should ignore merge commits #12933

New Issue
Open
opened 2025-11-02 10:25:32 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 10:25:32 -06:00
Owner
Copy Link

Originally created by @TheFriendlyCoder on GitHub (Apr 29, 2024).

Feature Description

When a new PR gets created and the source branch matches the commit history of the target branch exactly with the exception of a merge commit, the web UI warns you the the source branch is out of date. While this is, strictly speaking, accurate, merge commits don’t actually contain any source code changes and so this warning can be ignored. However, if there are actual code commits on the target branch then it may not be safe to ignore this warning. Without doing a full comparison between the branches it is impossible to know for sure. This creates unnecessary confusion for users.

I am pretty sure other git repository tools like GitHub and Gitlab exclude merge commits when doing history comparisons to avoid this problem.

This issue is particularly problematic for developers that regularly stack commits across multiple PRs because every PR after the first will inherit this branch out of date warning

Screenshots

No response

Originally created by @TheFriendlyCoder on GitHub (Apr 29, 2024). ### Feature Description When a new PR gets created and the source branch matches the commit history of the target branch exactly with the exception of a merge commit, the web UI warns you the the source branch is out of date. While this is, strictly speaking, accurate, merge commits don’t actually contain any source code changes and so this warning can be ignored. However, if there are actual code commits on the target branch then it may not be safe to ignore this warning. Without doing a full comparison between the branches it is impossible to know for sure. This creates unnecessary confusion for users. I am pretty sure other git repository tools like GitHub and Gitlab exclude merge commits when doing history comparisons to avoid this problem. This issue is particularly problematic for developers that regularly stack commits across multiple PRs because every PR after the first will inherit this branch out of date warning ### Screenshots _No response_
GiteaMirror added the type/proposal label 2025-11-02 10:25:32 -06:00
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 type/proposal
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#12933
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?