<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:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@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-top:6.0pt;
margin-right:0cm;
margin-bottom:6.0pt;
margin-left:0cm;
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;}
p.Code, li.Code, div.Code
{mso-style-name:Code;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Courier New";
mso-fareast-language:EN-US;}
span.EmailStyle18
{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;}
.MsoPapDefault
{mso-style-type:export-only;
margin-top:6.0pt;
margin-right:0cm;
margin-bottom:6.0pt;
margin-left:0cm;}
@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">Friends<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">I’m stuck with Git. Help please!<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">I tried to do a ‘git stash pop’, having just done a ‘git pull’ from the master repo. I got this:<o:p></o:p></span></p>
<p class="Code">simonpj@cam-05-unx:~/code/HEAD-2$ git stash pop<o:p></o:p></p>
<p class="Code">warning: Failed to merge submodule utils/haddock (commits don't follow merge-base)<o:p></o:p></p>
<p class="Code">Auto-merging utils/haddock<o:p></o:p></p>
<p class="Code">CONFLICT (submodule): Merge conflict in utils/haddock<o:p></o:p></p>
<p class="Code">Auto-merging compiler/typecheck/TcRnMonad.lhs<o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Now git status says<o:p></o:p></span></p>
<p class="Code">simonpj@cam-05-unx:~/code/HEAD-2$ git status<o:p></o:p></p>
<p class="Code"># On branch master<o:p></o:p></p>
<p class="Code"># Your branch is ahead of 'origin/master' by 2 commits.<o:p></o:p></p>
<p class="Code">#<o:p></o:p></p>
<p class="Code"># Changes to be committed:<o:p></o:p></p>
<p class="Code"># (use "git reset HEAD <file>..." to unstage)<o:p></o:p></p>
<p class="Code">#<o:p></o:p></p>
<p class="Code"># modified: compiler/typecheck/TcMType.lhs<o:p></o:p></p>
<p class="Code"># modified: compiler/typecheck/TcRnMonad.lhs<o:p></o:p></p>
<p class="Code"># modified: compiler/typecheck/TcSimplify.lhs<o:p></o:p></p>
<p class="Code"># modified: compiler/typecheck/TcUnify.lhs<o:p></o:p></p>
<p class="Code">#<o:p></o:p></p>
<p class="Code"># Unmerged paths:<o:p></o:p></p>
<p class="Code"># (use "git reset HEAD <file>..." to unstage)<o:p></o:p></p>
<p class="Code"># (use "git add/rm <file>..." as appropriate to mark resolution)<o:p></o:p></p>
<p class="Code">#<o:p></o:p></p>
<p class="Code"># both modified: utils/haddock<o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:12.0pt">The modified files are right. It’s the “both modified utils/haddock” that is messing me up.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">I’m not modifying haddock! I just want to say “take the master haddock”, but I don’t know how. I tried ‘git checkout utils/haddock’ but that just led do `git status’ saying<o:p></o:p></span></p>
<p class="Code"># modified: utils/haddock (new commits)<o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
<p class="Code"><o:p> </o:p></p>
</div>
</body>
</html>