<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:12.0pt">Herbert<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">I did ‘git pull’ in my source tree and got the error below. What do I do now?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Simon<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== running git pull<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">remote: Counting objects: 56029, done.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">remote: Compressing objects: 100% (16843/16843), done.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">remote: Total 55837 (delta 32572), reused 55743 (delta 32500)
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Receiving objects: 100% (55837/55837), 6.47 MiB | 2.96 MiB/s, done.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Resolving deltas: 100% (32572/32572), completed with 102 local objects.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">From git://git.haskell.org/ghc<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> b7ddf63..9c91a24 master -> origin/master<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Updating b7ddf63..9c91a24<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">error: The following untracked working tree files would be overwritten by merge:<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/.gitignore<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/LICENSE<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/LICENSE.GPL<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/README.md<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/config/bad.ps<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/config/ghc<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/config/good.ps<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/driver/runtests.py<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/driver/testglobals.py<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/driver/testlib.py<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/driver/testutil.py<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/mk/boilerplate.mk<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/mk/ghc-config.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/mk/test.mk<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_compile/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_compile/all.T<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_compile/ann01.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_compile/ann01.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/Annfail04_Help.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/Annfail05_Help.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/Annfail06_Help.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/all.T<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail01.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail01.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail02.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail02.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail03.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail03.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail04.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail04.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail05.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail05.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail06.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail06.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail07.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail07.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail08.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail08.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail09.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail09.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail10.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail10.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail11.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail11.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail12.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail12.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail13.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_fail/annfail13.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_run/Annrun01_Help.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_run/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_run/all.T<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_run/annrun01.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/annotations/should_run/annrun01.stdout<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/Main.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/Main.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f0.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f0.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f1.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f1.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f10.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f10.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f11.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f11.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f12.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f12.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f13.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f13.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f14.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f14.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f15.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f15.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f2.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f2.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f3.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f3.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f4.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f4.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f5.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f5.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f6.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f6.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f7.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f7.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f8.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f8.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f9.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/f9.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/prim.hs<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/arityanal/prim.stderr<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/array/Makefile<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"> testsuite/tests/array/shou<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Aborting<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">git failed: 256 at ./sync-all line 120.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for old haddock repo<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for old binary repo<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for old mtl repo<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for old Cabal repo<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for old time from tarball<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">== Checking for obsolete Git repo URL<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">simonpj@cam-05-unx:~/code/HEAD-2$<o:p></o:p></span></p>
</div>
</body>
</html>