aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo8
1 files changed, 8 insertions, 0 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index 064bbf2..7d58c2a 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -1381,6 +1381,14 @@ not a file you can open and se the conflicts in
so you must open both's versions and manual
inspect and merge them.
+Perhaps you plan to work alone and never ever
+get another developer on your project and are
+not convinced that merge conflicts reason
+enough to work text based formats. Than consider
+that you need to know the exact changes of
+commits; the Git log will not be able to help
+you if you are using binary formats.
+
Luckily most type of files formats have an
text based alternative.