diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-16 15:12:12 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-16 15:12:12 +0200 |
| commit | 8c94d985dde3bb7c6f2c7e57891c38573062d5f7 (patch) | |
| tree | 1ec8b3705034e9ed1861ade0b355d91ecaa44f7f /using-git.texinfo | |
| parent | typo (diff) | |
| download | using-git-8c94d985dde3bb7c6f2c7e57891c38573062d5f7.tar.gz using-git-8c94d985dde3bb7c6f2c7e57891c38573062d5f7.tar.bz2 using-git-8c94d985dde3bb7c6f2c7e57891c38573062d5f7.tar.xz | |
more on binary formats
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 8 |
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. |