summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2022-02-15 14:55:38 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2022-02-15 14:58:27 +0100
commit853e53dfdc0aeb4e00a79aac9379f8d522c0dded (patch)
treea867eb494d1caade01a1f11082a216c294cd4a5f
parentopenssl02: Add missing include (diff)
downloadrtems-libbsd-853e53dfdc0aeb4e00a79aac9379f8d522c0dded.tar.bz2
CONTRIBUTING: Clarify white space changes
-rw-r--r--CONTRIBUTING.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e1cf152a..57b05e42 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
-------------------------------------