<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 16/02/2018 11:21, Francois Armand
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:9987c4ea-d955-1be3-ecba-efb2edd01897@normation.com">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<p>Hello, <br>
</p>
<p>Yesterday we had a merge problem with our automated script
which broke the "rudder" Git repository. <br>
</p>
<p>Details of the problem and workaround are in <a
class="moz-txt-link-freetext"
href="https://www.rudder-project.org/redmine/issues/12128"
moz-do-not-send="true">https://www.rudder-project.org/redmine/issues/12128</a><br>
</p>
<p>If you are not using that repository, you can safely ignore
that message. <br>
</p>
<p>On the other hand, you will need to reset branches 4.1, 4.2,
4.3 and master. <br>
</p>
<p>There are several methods describe in the ticket, two of them
follow: <br>
</p>
<ul>
<li>the simplest, if you use the repository only for read, is to
delete the repository and clone it back:<br>
</li>
<ul>
<li><tt>rm -rf my_repos/rudder</tt></li>
<li><tt>git clone <a class="moz-txt-link-freetext"
href="https://github.com/Normation/rudder.git"
moz-do-not-send="true">https://github.com/Normation/rudder.git</a></tt><br>
</li>
</ul>
<li>if you use the repository for development, you will need to
update all branches: <br>
</li>
<ul>
<li><b><tt>git fetch</tt></b></li>
<ul>
<li>you will see a message about a force update</li>
</ul>
<li><tt>f</tt><tt>or i in 4.1 4.2 4.3; do git checkout
branches/rudder/$i ; git reset --hard
origin/branches/rudder/$i ; done</tt></li>
<li><tt>git checkout master ; git reset --hard origin/master</tt></li>
</ul>
</ul>
<p>We are sorry for the inconvenience. <br>
</p>
<p>Have a nice day !<br>
</p>
</blockquote>
<br>
Oups, we did it again. Same procedure need to be applied on all your
dev branches. <br>
<br>
But it should not happen anymore in the future! (and we're really
sorry about that)<br>
<br>
<br>
<div class="moz-signature">-- <br>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<style type="text/css"><!--
a.redlink:link { color: #1782E6; text-decoration: none; }
a.redlink:visited { color: #1782E6; text-decoration: none; }
.sig { font-family: 'Century Gothic', CenturyGothic, AppleGothic, sans-serif; font-size: small; }
.sigsmall { font-family: 'Century Gothic', CenturyGothic, AppleGothic, sans-serif; font-size: x-small; }
--></style>
<br>
<br>
<table width="380" cellspacing="2" cellpadding="0" border="0">
<tbody>
<tr>
<td colspan="2">
<hr></td>
</tr>
<tr>
<td colspan="2"><b><img alt=""
src="cid:part3.1E5CAD20.A461ADE4@normation.com"
width="50" align="left" height="50" hspace="10"> <span
class="sig">François ARMAND</span></b><br>
<span class="sig"><i>Co-founder & CTO</i></span><br>
<span class="sig"><a class="redlink"
href="http://www.normation.com">Normation</a></span> </td>
</tr>
<tr>
<td colspan="2">
<hr></td>
</tr>
<tr>
<td colspan="2"><span class="sigsmall"><b>87 rue de Turbigo,
75003 Paris, France</b></span></td>
</tr>
<tr>
<td><span class="sigsmall">Telephone:</span></td>
<td><span class="sigsmall">+33 (0)1 83 62 99 23</span></td>
</tr>
<tr>
<td><span class="sigsmall">Mobile:</span></td>
<td><span class="sigsmall">+33 (0)6 63 37 60 55</span></td>
</tr>
<tr>
<td colspan="2">
<hr></td>
</tr>
</tbody>
</table>
</div>
</body>
</html>