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

.docx file can't use pull request #4852

New Issue
Closed
opened 2025-11-02 06:04:58 -06:00 by GiteaMirror · 5 comments
GiteaMirror commented 2025-11-02 06:04:58 -06:00
Owner
Copy Link

Originally created by @GuoQiXiaoMing on GitHub (Feb 14, 2020).

  • Gitea version (or commit ref):1.12.0+dev-213-gf29c30104
  • Git version:2.24.0.windows.2
  • Operating system:windows
  • Database (use [x]):
    • PostgreSQL
    • [ x] MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gitea.io:
    • Yes (provide example URL)
    • No
    • Not relevant
  • Log gist:

Description

change any docx file, than push to "xxx" branch.

use pull requests to merge from "xxx" to master branch.

report this:
"This pull request has changes conflicting with the target branch.
testdoc.docx"

can't resolve, and didn't show conflict at local.

Screenshots

image

Originally created by @GuoQiXiaoMing on GitHub (Feb 14, 2020). <!-- NOTE: If your issue is a security concern, please send an email to security@gitea.io instead of opening a public issue --> <!-- 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. 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.12.0+dev-213-gf29c30104 - Git version:2.24.0.windows.2 - Operating system:windows - Database (use `[x]`): - [ ] PostgreSQL - [ x] MySQL - [ ] MSSQL - [ ] SQLite - Can you reproduce the bug at https://try.gitea.io: - [ ] Yes (provide example URL) - [ ] No - [ ] Not relevant - Log gist: ## Description change any docx file, than push to "xxx" branch. use pull requests to merge from "xxx" to master branch. report this: "This pull request has changes conflicting with the target branch. testdoc.docx" can't resolve, and didn't show conflict at local. ## Screenshots <!-- **If this issue involves the Web Interface, please include a screenshot** --> ![image](https://user-images.githubusercontent.com/58553709/74505011-f4a99380-4f30-11ea-9475-f40822281f51.png)
GiteaMirror added the issue/stale label 2025-11-02 06:04:58 -06:00
GiteaMirror commented 2025-11-02 06:04:59 -06:00
Author
Owner
Copy Link

@stale[bot] commented on GitHub (Apr 14, 2020):

This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

@stale[bot] commented on GitHub (Apr 14, 2020): This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.
GiteaMirror commented 2025-11-02 06:04:59 -06:00
Author
Owner
Copy Link

@6543 commented on GitHub (Apr 14, 2020):

@GuoQiXiaoMing just merge master into your feature-branch or rebase it localy

@6543 commented on GitHub (Apr 14, 2020): @GuoQiXiaoMing just merge master into your feature-branch or rebase it localy
GiteaMirror commented 2025-11-02 06:05:00 -06:00
Author
Owner
Copy Link

@6543 commented on GitHub (Apr 14, 2020):

By the way it's a bad idear to work with docx and git since git thinks of it as binary - to store it once it should make no problems but working with doc(x) on git in combination with pull requests is torture

@6543 commented on GitHub (Apr 14, 2020): By the way it's a bad idear to work with docx and git since git thinks of it as binary - to store it once it should make no problems but working with doc(x) on git in combination with pull requests is torture
GiteaMirror commented 2025-11-02 06:05:00 -06:00
Author
Owner
Copy Link

@stale[bot] commented on GitHub (Jun 13, 2020):

This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

@stale[bot] commented on GitHub (Jun 13, 2020): This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.
GiteaMirror commented 2025-11-02 06:05:00 -06:00
Author
Owner
Copy Link

@stale[bot] commented on GitHub (Jun 27, 2020):

This issue has been automatically closed because of inactivity. You can re-open it if needed.

@stale[bot] commented on GitHub (Jun 27, 2020): This issue has been automatically closed because of inactivity. You can re-open it 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 issue/stale
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#4852
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?