guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/09: gnu: Add comment to the bottom of version-control.scm.


From: guix-commits
Subject: 08/09: gnu: Add comment to the bottom of version-control.scm.
Date: Tue, 16 Apr 2024 17:51:12 -0400 (EDT)

cbaines pushed a commit to branch master
in repository guix.

commit 99e7a93d57fb1fbcc98a857f50b611d1df111d9a
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue Apr 16 22:46:47 2024 +0100

    gnu: Add comment to the bottom of version-control.scm.
    
    This will hopefully discourage patches which add new packages to the bottom 
of
    files, as this increases the likelihood of conflicts when applying patches.
    
    If there are more specific ways that packages should be arranged in specific
    modules, this message can be updated accordingly.
    
    * gnu/packages/version-control.scm: Add comment at end of file.
    
    Change-Id: I3d20a6fd957d9cfee9d7b4a4c7979c4202a0fe3a
---
 gnu/packages/version-control.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 55fa49e632..0c7c496c82 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -4173,3 +4173,9 @@ comes as a command line app and also an Emacs interface.")
     (description "Compute various size metrics for a Git repository, flagging
 those that might cause problems or inconvenience.")
     (license license:expat)))
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]