<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
Some docs got merged last night. I think that if you fetch the latest and rebase that you’ll end up with conflicts that you need to resolve manually. The Readme file has changed a lot, so I’m sure git doesn’t know how to merge your changes in.
<div><br>
</div>
<div>Tim</div>
<div><br>
<div>
<div>On Aug 18, 2014, at 10:21 PM, Rajdeep Dua <<a href="mailto:rajdeep.dua@gmail.com">rajdeep.dua@gmail.com</a>> wrote:</div>
<br class="Apple-interchange-newline">
<blockquote type="cite">
<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="mailto: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="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="font-family: sans-serif;"><br>
</span></div>
<div><span style="font-family: sans-serif;">Rebase and commit?</span></div>
</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">
<div>
<div class="h5">On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua <span dir="ltr"><<a href="mailto: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 class="h5">
<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">Rajdeep</font></span></div>
<br>
</div>
</div>
_______________________________________________<br>
OpenStack-dev mailing list<br>
<a href="mailto: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 class="HOEnZb"><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="mailto:OpenStack-dev@lists.openstack.org">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>
_______________________________________________<br>
OpenStack-dev mailing list<br>
<a href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a><br>
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev<br>
</blockquote>
</div>
<br>
</div>
</body>
</html>