Resolving Merge Conflicts On Gitea

[AaronS8]

Feature Description

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

Screenshots

[AaronS8]

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]

GitHub Merge Conflict Editor

[zeripath]

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

[richmahn]

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