You need to rebase again. The readme file changed before Jenkins got a chance to test your patch.<span></span><br><br>On Monday, August 18, 2014, Rajdeep Dua <<a href="mailto:rajdeep.dua@gmail.com">rajdeep.dua@gmail.com</a>> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">my branch already has the latest changes.<div>it is not able to merge two rst files hence it failed</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 19, 2014 at 10:02 AM, Akash Gangil <span dir="ltr"><<a href="javascript:_e(%7B%7D,'cvml','akashg1611@gmail.com');" target="_blank">akashg1611@gmail.com</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span style="color:rgb(0,0,0);font-family:sans-serif">"This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset."</span><br>



<div><span style="color:rgb(0,0,0);font-family:sans-serif"><br></span></div><div><span style="color:rgb(0,0,0);font-family:sans-serif">Rebase and commit?</span></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">

<div><div>

On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua <span dir="ltr"><<a href="javascript:_e(%7B%7D,'cvml','rajdeep.dua@gmail.com');" target="_blank">rajdeep.dua@gmail.com</a>></span> wrote:<br></div></div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div><div>

<div dir="ltr">One of my CL - updation of  README.rst seems to be failing jenkins <div><br></div><div><a href="https://review.openstack.org/#/c/114896/1" target="_blank">https://review.openstack.org/#/c/114896/1</a><br></div>



<div><br></div>
<div>Any idea how to get this passed?</div><div><br></div><div>Thanks</div><span><font color="#888888"><div>Rajdeep</div></font></span></div>
<br></div></div>_______________________________________________<br>
OpenStack-dev mailing list<br>
<a href="javascript:_e(%7B%7D,'cvml','OpenStack-dev@lists.openstack.org');" target="_blank">OpenStack-dev@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br>
<br></blockquote></div><span><font color="#888888"><br><br clear="all"><div><br></div>-- <br>Akash<br>
</font></span></div>
<br>_______________________________________________<br>
OpenStack-dev mailing list<br>
<a href="javascript:_e(%7B%7D,'cvml','OpenStack-dev@lists.openstack.org');" target="_blank">OpenStack-dev@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br>
<br></blockquote></div><br></div>
</blockquote><br><br>-- <br>Sent from Gmail Mobile<br>