bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
This commit is contained in:
Murilo 2026-01-23 10:48:46 -03:00
parent 8a6933c84e
commit f95cb20aab
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/contributing.texi
View file

@ -1774,6 +1774,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