[rtems-libbsd commit] CONTRIBUTING: Clarify white space changes
Sebastian Huber
sebh at rtems.org
Tue Feb 15 13:49:04 UTC 2022
Module: rtems-libbsd
Branch: 6-freebsd-12
Commit: 4b724e86c01cf0276275df8e439be4f57d272af6
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=4b724e86c01cf0276275df8e439be4f57d272af6
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 5336b22..cb2bbeb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -388,7 +388,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