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

Command line hints for merge conflict resolution in PR template #100

New Issue
Open
opened 2025-11-02 03:08:54 -06:00 by GiteaMirror · 3 comments
GiteaMirror commented 2025-11-02 03:08:54 -06:00
Owner
Copy Link

Originally created by @lunny on GitHub (Nov 30, 2016).

Sometimes, we will use manually to merge PR to resolve some conflicts. But if some command line hints in the PR UI like github has is very useful.

Originally created by @lunny on GitHub (Nov 30, 2016). Sometimes, we will use manually to merge PR to resolve some conflicts. But if some command line hints in the PR UI like github has is very useful.
GiteaMirror added the topic/uiissue/confirmedtype/enhancement labels 2025-11-02 03:08:54 -06:00
GiteaMirror commented 2025-11-02 03:08:55 -06:00
Author
Owner
Copy Link

@bkcsoft commented on GitHub (Dec 2, 2016):

Updated the title for clarity

@bkcsoft commented on GitHub (Dec 2, 2016): Updated the title for clarity
GiteaMirror commented 2025-11-02 03:08:55 -06:00
Author
Owner
Copy Link

@stale[bot] commented on GitHub (Feb 17, 2019):

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.

@stale[bot] commented on GitHub (Feb 17, 2019): This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.
GiteaMirror commented 2025-11-02 03:08:55 -06:00
Author
Owner
Copy Link

@lunny commented on GitHub (Sep 11, 2023):

The conflicted files check is async, so it's not easy to get the conflicted files immediately. Maybe I should close this issue.

@lunny commented on GitHub (Sep 11, 2023): The conflicted files check is async, so it's not easy to get the conflicted files immediately. Maybe I should close this issue.
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/confirmed topic/ui type/enhancement
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#100
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?