diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-09-16 11:21:56 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-09-16 11:21:56 +0200 |
| commit | 19e50a73dbc8c572411cede44811ab157b5b335e (patch) | |
| tree | 6be5628a07f0fb08d750392ad445e08789d610b9 /using-git.texinfo | |
| parent | more additional tools (diff) | |
| download | using-git-19e50a73dbc8c572411cede44811ab157b5b335e.tar.gz using-git-19e50a73dbc8c572411cede44811ab157b5b335e.tar.bz2 using-git-19e50a73dbc8c572411cede44811ab157b5b335e.tar.xz | |
the binary problem
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index ae77656..e8ab4c9 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1301,6 +1301,7 @@ is annoying. @menu * Additional tools:: +* The binary problem:: @end menu @@ -1360,6 +1361,23 @@ Lesser General Public License. +@node The binary problem +@section The binary problem + +Source control does not work well with binary +files. Consider that two persons are edition +the same file which cannot be interpreted by +a human using a text editor. If there is a +conflict, git may not realise it depending on +the binary format, or may not be able to merge +the changes. If git cannot merge the and you +cannot open it in a text editor, you will +not a file you can open an se the conflicts in +so you must open both's versions and manual +inspect and merge them. + + + @node GNU Free Documentation License @appendix GNU Free Documentation License @include fdl.texinfo |