StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Since your <code>.uni</code> file is actually a text file, I suppose it must have some NUL character in it (see "<a href="https://stackoverflow.com/questions/6119956/how-to-determine-if-git-handles-a-file-as-binary-or-as-text">How to determine if Git handles a file as binary or as text?</a>").</p> <p>It depends on how you want to manage the merge.</p> <p>As mentioned in "<a href="https://stackoverflow.com/questions/2920594/tell-git-not-to-merge-binary-files-but-to-choose">Tell git not to merge binary files but to choose</a>", you can specify a merge manager in a <code>.gitattributes</code> file which will merge according to your policy.</p> <p>At least, as in "<a href="https://stackoverflow.com/questions/4735663/why-does-git-treat-some-cpp-files-as-binary">why does git treat some cpp files as binary?</a>", you can try and specify (still ion the <code>.gitattributes</code> file):</p> <pre><code>*.uni -text crlf diff </code></pre> <hr> <p>For Unicode files, looking at "<a href="https://stackoverflow.com/questions/777949/can-i-make-git-recognize-a-utf-16-file-as-text">Can I make git recognize a UTF-16 file as text?</a>", you can:</p> <ul> <li>either define a custom diff or merge tool supporting that format: <code>git config --global diff.tool vimdiff ; git difftool commit1 commit2</code></li> <li>or define an attribute like: *.uni diff merge -crlf</li> </ul> <p>You should also make sure:</p> <ul> <li>you have git1.7.10+ (which has better UTF-8 support)</li> <li>have set the utf-8 settings: see "<a href="https://stackoverflow.com/a/5855213/6309">git, msysgit, accents, utf-8, the definitive answers</a>".</li> </ul>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload