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

Resolving Merge Conflicts On Gitea #8477

New Issue
Closed
opened 2025-11-02 08:07:50 -06:00 by GiteaMirror · 4 comments
GiteaMirror commented 2025-11-02 08:07:50 -06:00
Owner
Copy Link

Originally created by @AaronS8 on GitHub (Feb 3, 2022).

Feature Description

I think it would be great if gitea could have merge conflict editor like visual studio

Screenshots

manual Merge
wecandothisto

Originally created by @AaronS8 on GitHub (Feb 3, 2022). ### Feature Description I think it would be great if gitea could have merge conflict editor like visual studio ### Screenshots ![manual Merge](https://user-images.githubusercontent.com/98172519/152312301-f8b7f681-143f-4116-8f89-5001129d8014.jpg) ![wecandothisto](https://user-images.githubusercontent.com/98172519/152312365-6a705b68-49cc-454b-bbf2-3b06f17104e7.jpg)
GiteaMirror added the issue/duplicate label 2025-11-02 08:07:50 -06:00
GiteaMirror commented 2025-11-02 08:07:52 -06:00
Author
Owner
Copy Link

@AaronS8 commented on GitHub (Feb 3, 2022):

visual studio behaviour

  1. after you try merging and conflict occures
  2. it lists the files with merging errors under the Unmerged Changes
  3. Then when you select a file it opens the merge conflict editor
  4. it lets you select wich difference your going to take you can even select both of them which it assumes the first selected comes first and puts it on top
  5. it have check box like that shows
    • Show Conflicts Only
    • Take Incoming
    • Take Current
    • Indivisually line by line using check box to let the merge editor you will take that change
  6. After you resolve all conflicts in a file and click accept merge the file is automaticaly staged
  7. after all conflicts are resolved you can commit your merge.
@AaronS8 commented on GitHub (Feb 3, 2022): ### visual studio behaviour 1. after you try merging and conflict occures 2. it lists the files with merging errors under the **_Unmerged Changes_** 3. Then when you select a file it opens the merge conflict editor 4. it lets you select wich difference your going to take you can even select both of them which it assumes the first selected comes first and puts it on top 5. it have check box like that shows - Show Conflicts Only - Take Incoming - Take Current - Indivisually line by line using check box to let the merge editor you will take that change 6. After you resolve all conflicts in a file and click accept merge the file is automaticaly staged 7. after all conflicts are resolved you can commit your merge.
GiteaMirror commented 2025-11-02 08:07:52 -06:00
Author
Owner
Copy Link

@AaronS8 commented on GitHub (Feb 3, 2022):

GitHub Merge Conflict Editor

Githubmergeconflict

@AaronS8 commented on GitHub (Feb 3, 2022): ### GitHub Merge Conflict Editor ![Githubmergeconflict](https://user-images.githubusercontent.com/98172519/152333521-11bafce3-77ef-4bf4-9069-c1b5662f110f.jpg)
GiteaMirror commented 2025-11-02 08:07:52 -06:00
Author
Owner
Copy Link

@zeripath commented on GitHub (Feb 3, 2022):

This is a duplicate request. Please do not open duplicate issues.

@zeripath commented on GitHub (Feb 3, 2022): This is a duplicate request. Please do not open duplicate issues.
GiteaMirror commented 2025-11-02 08:07:53 -06:00
Author
Owner
Copy Link

@richmahn commented on GitHub (Feb 22, 2022):

Don't see the original issue. It's #9014

@richmahn commented on GitHub (Feb 22, 2022): Don't see the original issue. It's #9014
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/duplicate
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#8477
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?