<html>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<br>
<div class="moz-cite-prefix">Le 08/12/2014 09:13, Eli Qiao a écrit :<br>
</div>
<blockquote cite="mid:54855D99.1030002@linux.vnet.ibm.com"
type="cite">
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
<br>
<div class="moz-cite-prefix">在 2014年12月08日 16:05, Eduard Matei 写道:<br>
</div>
<blockquote
cite="mid:CAEOp6J8uui5E=4xUWW+PS_Jd__MjukbGR6Gboy8C9DCSQT8RwQ@mail.gmail.com"
type="cite">
<div dir="ltr">Hi,
<div>My review got approved and it was ready to merge but
automatic merge failed.</div>
<div>I tried to rebase manually but it still fails.</div>
<div><br>
</div>
<div>I'm not very familiar with git, can someone give a hand?</div>
<div>
<div><br>
</div>
<div> git rebase -i master</div>
<div>error: could not apply db4a3bb... New Cinder volume
driver for openvstorage.</div>
<div><br>
</div>
</div>
</div>
</blockquote>
hi Eduard<br>
yeah, you need to manually rebase the changes.<br>
git status check which files should be changes (file name in red)
and find <<< in<br>
the file , modify it. after doing that , git add <file
name>, all conflict files need to <br>
be done, then git reabase --continue.<br>
</blockquote>
<br>
<br>
Or you can just raise the magical wand and invoke "git mergetool"
with your favourite editor (vimdiff, kdiff3 or whatever else) and
leave this tool show you the difference in between the base branch
(when the code branched), the local branch (the master branch) and
the remote branch (your changes)<br>
<br>
My USD0.02<br>
<br>
-Sylvain<br>
<br>
<blockquote cite="mid:54855D99.1030002@linux.vnet.ibm.com"
type="cite">
<blockquote
cite="mid:CAEOp6J8uui5E=4xUWW+PS_Jd__MjukbGR6Gboy8C9DCSQT8RwQ@mail.gmail.com"
type="cite">
<div dir="ltr">
<div>
<div>When you have resolved this problem, run "git rebase
--continue".</div>
<div>If you prefer to skip this patch, run "git rebase
--skip" instead.</div>
<div>To check out the original branch and stop rebasing, run
"git rebase --abort".</div>
<div>Could not apply
db4a3bb3645b27de7b12c0aa405bde3530dd19f8... New Cinder
volume driver for openvstorage.</div>
<div> git rebase --continue</div>
<div>etc/cinder/cinder.conf.sample: needs merge</div>
<div>You must edit all merge conflicts and then</div>
<div>mark them as resolved using git add</div>
<div><br>
</div>
<div>Review is: <a moz-do-not-send="true"
href="https://review.openstack.org/#/c/130733/">https://review.openstack.org/#/c/130733/</a></div>
<div><br>
</div>
<div>Thanks,</div>
<div>Eduard</div>
<div><br>
</div>
-- <br>
<div class="gmail_signature">
<div dir="ltr">
<pre style="white-space:pre-wrap;font-size:10px;word-wrap:break-word;margin-top:0px;margin-bottom:0px"><div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><b><span style="font-size:10pt;font-family:Arial,sans-serif" lang="EN-US">Eduard Biceri Matei, Senior Software Developer</span></b></div><div style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-size:13.5pt;font-family:Helvetica,sans-serif"><a moz-do-not-send="true" href="http://www.cloudfounders.com/" style="color:rgb(17,85,204)" target="_blank"><span style="font-size:11pt;font-family:Calibri,sans-serif" lang="EN-US"><font color="#0045a3">www.cloudfounders.com</font></span></a></span><span style="font-size:11pt;font-family:Calibri,sans-serif" lang="EN-US"><font color="#1f497d"> | </font><a moz-do-not-send="true" href="mailto:eduard.matei@cloudfounders.com" sty!
le!="color
:rg
b(17,85,204)" target="_blank"><font color="#0045a3">eduard.matei@cloudfounders.com</font></a></span></div><div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)" lang="EN-US"> </span></div>
<div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-size:13.5pt;font-family:Arial,sans-serif;color:rgb(80,0,80)" lang="EN-US"> </span></div><div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><b><span style="font-size:13.5pt;font-family:Arial,sans-serif" lang="EN-US">CloudFounders, The Private Cloud Software Company</span></b><span style="font-size:13.5pt;font-family:Arial,sans-serif" lang="EN-US"></span></div><div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-size:13.5pt;font-family:Helvetica,sans-serif" lang="EN-US"> </span></div><div style="font-family:arial,sans-serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-family:Helvetica,sans-serif;font-size:11px" lang="EN-US">Disclaimer:</span></div><div style="font-family:a!
rial,sans-
serif;font-size:13px;text-align:-webkit-auto;white-space:normal;margin:0px"><span style="font-size:8.5pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)" lang="EN-US">This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed.</span><span style="font-family:Calibri,sans-serif;color:rgb(31,73,125)" lang="EN-US">
<span style="font-size:11px">If you are not the named addressee or an employee or agent responsible for delivering this message to the named addressee, you are hereby notified that you are not authorized to read, print, retain, copy or disseminate this message or any part of it. If you have received this email in error we request you to notify us by reply e-mail and to delete all electronic files of the message. If you are not the intended recipient you are notified that disclosing, copying, distributing or taking any action in reliance on the contents of this information is strictly prohibited.
E-mail transmission cannot be guaranteed to be secure or error free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses. The sender therefore does not accept liability for any errors or omissions in the content of this message, and shall have no liability for any loss or damage suffered by the user, which arise as a result of e-mail transmission.</span></span></div></pre>
</div>
</div>
</div>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
OpenStack-dev mailing list
<a moz-do-not-send="true" class="moz-txt-link-abbreviated" href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a>
<a moz-do-not-send="true" class="moz-txt-link-freetext" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a>
</pre>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Thanks,
Eli (Li Yong) Qiao</pre>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
OpenStack-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a>
<a class="moz-txt-link-freetext" href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a>
</pre>
</blockquote>
<br>
</body>
</html>