From f95cb20aab4649ee06d49b9229c2b84ed58ba5aa Mon Sep 17 00:00:00 2001 From: Murilo Date: Fri, 23 Jan 2026 10:48:46 -0300 Subject: [PATCH] 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 --- doc/contributing.texi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/contributing.texi b/doc/contributing.texi index e55f418c2de..d49c30a2887 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1774,6 +1774,16 @@ entry. @end itemize +@subsubsection Resolving merge conflicts in Pull Requests + +For Rust crates, the recommended way to solve merge conflicts is to drop all +changes to @code{gnu/packages/rust-crates.scm}, rebase onto the desired branch +and run the lockfile importer again, manually adding back all relevant snippets +(if any). + +@xref{Common Workflow for Resolving Merge Conflicts on Existing Pull Requests,,, guix-cookbook, GNU Guix Cookbook} for +a suggested workflow on resolving merge conflicts. + @node Elm Packages @subsection Elm Packages