docs/submittingpatches: Fix confusing typo + missing pronoun
Reviewed-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4066>
This commit is contained in:
@@ -386,7 +386,8 @@ yourself warned.
|
||||
<p>
|
||||
By default merge conflicts are resolved by the stable-release manager. The
|
||||
release maintainer should resolve trivial conflicts, but for complex conflicts
|
||||
should ask the original author to provide a backport of de-nominate.
|
||||
they should ask the original author to provide a backport or de-nominate the
|
||||
patch.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
Reference in New Issue
Block a user