Menu
▾
▴
Re: [Rails-devel] 1880 and 1846
|
From: Stefan F. <ste...@we...> - 2013-11-01 08:59:49
|
<html>
<head>
<style><!--p.MsoNormal, li.MsoNormal, div.MsoNormal {
margin: 0.0cm;
font-size: 12.0pt;
font-family: "Times New Roman" , serif;
}
a:link, span.MsoHyperlink {
color: blue;
text-decoration: underline;
}
a:visited, span.MsoHyperlinkFollowed {
color: purple;
text-decoration: underline;
}
p {
margin-right: 0.0cm;
margin-left: 0.0cm;
font-size: 12.0pt;
font-family: "Times New Roman" , serif;
}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate {
margin: 0.0cm;
font-size: 8.0pt;
font-family: Tahoma , sans-serif;
}
span.BallontekstChar {
font-family: Tahoma , sans-serif;
}
span.E-mailStijl21 {
font-family: Calibri , sans-serif;
color: rgb(31,73,125);
}
*.MsoChpDefault {
font-size: 10.0pt;
}
div.WordSection1 {
page: WordSection1;
}
--></style>
</head>
<body link="blue" vlink="purple">Erik: Most likely the easiest thing to do is to restore from backup, if there have been uncommitted changes. <br>
Then commit those changes and push them to the branch you were coding against. <br>
If you accidentally used 1_7_12, no harm was done, as if I remember correctly there was no development work left in master.<br>
Stefan <br>
<br>
<br><br><div class="gmail_quote">Erik Vos <eri...@xs...> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<div class="WordSection1">
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">Hi Martin,</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">I made the mistake to do a ‘git pull’ without first checking my own status after a long time of inactivity, and now I seem to be in a mess.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">Gitbash now reports my status as ‘((v1.7.12)|MERGING), so I suppose I was in the v1.7.12 branch. Don’t remember why.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">I also seem to have had some uncommitted local changes, including a detail in 18EU/Map.xml, some initial work for 1837 (map etc.), and the new ‘trainMutexID’ Access attribute that I had proposed last year.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">As it seems I was in the wrong branch, I think there is not much point in attempting to resolve the merge conflict as it is.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">All I really want is to undo that misguided ‘git pull’, and to revert to the situation before that, so I can put my house in order first.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">But I’m not sure if there is a simple way to get there without having to go into all the details.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">I should have good file backups, so perhaps I’ll revert the whole 18XX project directory that way, hoping that the full git status is included.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);">Erik.</span></font>
</p>
<p class="MsoNormal">
<font color="#1f497d" face="Calibri" size="2"><span style="font-size: 11.0pt;font-family: Calibri , sans-serif;color: rgb(31,73,125);"> </span></font>
</p>
<div style="border: none;border-left: solid blue 1.5pt;padding: 0.0cm 0.0cm 0.0cm 4.0pt;">
<div>
<div style="border: none;border-top: solid rgb(181,196,223) 1.0pt;padding: 3.0pt 0.0cm 0.0cm 0.0cm;">
<p class="MsoNormal">
<b><font face="Tahoma" size="2"><span style="font-size: 10.0pt;font-family: Tahoma , sans-serif;font-weight: bold;">From:</span></font></b><font face="Tahoma" size="2"><span style="font-size: 10.0pt;font-family: Tahoma , sans-serif;"> Dr....@t-... [mailto:Dr....@t-...]<br/>
<b><span style="font-weight: bold;">Sent:</span></b> Wednesday, October 23, 2013 3:57 PM<br/>
<b><span style="font-weight: bold;">To:</span></b> Erik Vos<br/>
<b><span style="font-weight: bold;">Subject:</span></b> Re: [Rails-devel] 1880 and 1846</span></font>
</p>
</div>
</div>
<p class="MsoNormal">
<font face="Times New Roman" size="3"><span style="font-size: 12.0pt;"> </span></font>
</p>
<div>
<p style="margin: 0.0cm;">
<font color="black" face="Arial" size="3"><span style="font-size: 12.0pt;font-family: Arial , sans-serif;color: black;">What merge conflicts /errors do you have trying to do what exactly ?</span></font><font color="#1f497d" face="Arial"><span style="font-family: Arial , sans-serif;color: rgb(31,73,125);"></span></font>
</p>
</div>
</div>
</div>
</blockquote></div></body>
</html>
|
