diff options
| author | Murilo <murilo@disroot.org> | 2026-01-23 10:48:46 -0300 |
|---|---|---|
| committer | Gabriel Wicki <gabriel@erlikon.ch> | 2026-04-23 14:33:58 +0200 |
| commit | 4dcde1182537a568855a8f9a7d068ac88557aa4d (patch) | |
| tree | a8e5bd88238538b569cf4ab855c09407937fb77d /doc | |
| parent | 412394f444af293522368d6fadb034fcb3082d7f (diff) | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/contributing.texi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index d88e6f0484..07ff314a41 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1752,6 +1752,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 |