More info needed for resolving merge conflicts #14

On this page:

https://codeberg.org/Codeberg/Documentation/src/branch/master/Pull-requests-and-GIT-flow.md#user-content-keep-it-up-to-date-rebase-pull-requests-to-upstream

we need to rebase and resolve merge conflicts for upstream changes into our feature branch. This is not hard:

There should be more info, or a link to a page that elaborates on the process of resolving merge conflicts. The way it reads now could be incorrectly interpreted by people new to git that merge conflicts will be resolved automatically after doing those 3 steps shown.

The article has moved to https://codeberg.org/Codeberg/Documentation/src/branch/master/content/collaborating/pull-requests-and-git-flow.md

@andy5995 I agree with your interpretation. Would you like to have a look at the article and contribute an improved version? :)

In the meantime the article has moved again: https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/

There is an upstream issue to add an editor to resolve conflicts using the web-gui:
https://github.com/go-gitea/gitea/issues/9014