wangliu-iscas/guix-mirror
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-04-28 06:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Icbc5e2da01b6068b6237548f2bd49262433799de
Signed-off-by: Gabriel Wicki <gabriel@erlikon.ch>
This commit is contained in:
Murilo
2026-01-23 10:48:46 -03:00
committed by Gabriel Wicki
parent 412394f444
commit 4dcde11825
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/contributing.texi
View File

@@ -1752,6 +1752,16 @@ entry.
@end itemize @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 @node Elm Packages
@subsection Elm Packages @subsection Elm Packages