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

False conflict in Pull Request if docx file is changed #7068

New Issue
Closed
opened 2025-11-02 07:14:59 -06:00 by GiteaMirror · 2 comments
GiteaMirror commented 2025-11-02 07:14:59 -06:00
Owner
Copy Link

Originally created by @tbino5981 on GitHub (Mar 25, 2021).

  • Gitea version (or commit ref): 1.13.6
  • Git version: git version 2.31.0.windows.1
  • Operating system: Microsoft Windows Server Version 1607
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No

Description

We tried to merge a Pull-Request in our local Gitea-Instance. This failed with the message about a conflict even though there are no conflicting commits, or even any new commits in the target branch at all. The merge could be resolved with a fast-forward.

I could reproduce the problem with a newly started Gitea-Instance with default configs:

Originally created by @tbino5981 on GitHub (Mar 25, 2021). <!-- 1. Please speak English, this is the language all maintainers can speak and write. 2. Please ask questions or configuration/deploy problems on our Discord server (https://discord.gg/gitea) or forum (https://discourse.gitea.io). 3. Please take a moment to check that your issue doesn't already exist. 4. Make sure it's not mentioned in the FAQ (https://docs.gitea.io/en-us/faq) 5. Please give all relevant information below for bug reports, because incomplete details will be handled as an invalid report. --> - Gitea version (or commit ref): 1.13.6 - Git version: git version 2.31.0.windows.1 - Operating system: Microsoft Windows Server Version 1607 - Database (use `[x]`): - [ ] PostgreSQL - [ ] MySQL - [ ] MSSQL - [x] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [x] No ## Description We tried to merge a Pull-Request in our local Gitea-Instance. This failed with the message about a conflict even though there are no conflicting commits, or even any new commits in the target branch at all. The merge could be resolved with a fast-forward. I could reproduce the problem with a newly started Gitea-Instance with default configs: - clone https://github.com/weezlemsneezle/Gitea-Bug-Sample - change the remote to a newly created repository in Gitea - `git push -u origin master` - `git checkout pr` - `git push -u origin pr` - create a Pull Request from `pr` into `master`
GiteaMirror added the type/bug label 2025-11-02 07:14:59 -06:00
GiteaMirror commented 2025-11-02 07:15:00 -06:00
Author
Owner
Copy Link

@kevinlin18 commented on GitHub (Mar 25, 2021):

  • Gitea version (or commit ref): 1.13.6
  • Git version: git version 2.31.0
  • Operating system: Windows 10

Another example for this issue
https://try.gitea.io/kevinlin18/binarytest
PR on try.gitea.io works fine, but Gitea on Windows got conflicts

This pull request has changes conflicting with the target branch.
File.docx
File.ods
File.odt
File.pdf

@kevinlin18 commented on GitHub (Mar 25, 2021): - Gitea version (or commit ref): 1.13.6 - Git version: git version 2.31.0 - Operating system: Windows 10 Another example for this issue https://try.gitea.io/kevinlin18/binarytest PR on try.gitea.io works fine, but Gitea on Windows got conflicts > This pull request has changes conflicting with the target branch. > File.docx > File.ods > File.odt > File.pdf
GiteaMirror commented 2025-11-02 07:15:00 -06:00
Author
Owner
Copy Link

@noerw commented on GitHub (Mar 26, 2021):

This seems to be the same problem as https://github.com/go-gitea/gitea/issues/10913 (there is a workaround), please continue discussion there if needed

@noerw commented on GitHub (Mar 26, 2021): This seems to be the same problem as https://github.com/go-gitea/gitea/issues/10913 (there [is a workaround](https://github.com/go-gitea/gitea/issues/10913#issuecomment-726879161)), please continue discussion there if needed
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/bug
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#7068
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?