Murilo 4dcde11825 doc: Recommend a way of resolving merge conflicts for rust PRs. ...

* doc/contributing.texi (Rust Crates)
[Resolving merge conflicts in Pull Requests]: New subsubsection.

Change-Id: Icbc5e2da01b6068b6237548f2bd49262433799de
Signed-off-by: Gabriel Wicki <gabriel@erlikon.ch>

2026-04-23 14:33:58 +02:00

151 KiB

Raw Permalink Blame History

View Raw