[rtems-libbsd commit] CONTRIBUTING: Clarify white space changes

Sebastian Huber sebh at rtems.org
Tue Feb 15 13:49:45 UTC 2022


Module:    rtems-libbsd
Branch:    master
Commit:    853e53dfdc0aeb4e00a79aac9379f8d522c0dded
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=853e53dfdc0aeb4e00a79aac9379f8d522c0dded

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Feb 15 14:55:38 2022 +0100

CONTRIBUTING: Clarify white space changes

---

 CONTRIBUTING.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e1cf152..57b05e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -349,7 +349,10 @@ For new code use
 [STYLE(9)](http://www.freebsd.org/cgi/man.cgi?query=style&apropos=0&sektion=9).
 
 Do not format original FreeBSD code.  Do not perform white space changes even
-if you get git commit warnings.
+if you get git commit warnings.  Check your editor settings so that it doesn't
+perform white space changes automatically, for example adding a newline to the
+end of the file.  White space changes may result in conflicts during updates,
+especially changes at the end of a file.
 
 Automatically Generated FreeBSD Files
 -------------------------------------



More information about the vc mailing list