<div dir="ltr"><div>Hi all<br><br></div><div>My issue has been resolved by using "git rebase --onto ". Thanks for your reply.<br><br></div><div>Regards<br></div><div>zhengguang<br></div> <br></div><div class="gmail_extra">
<br><br><div class="gmail_quote">2014-04-19 23:50 GMT-04:00 Chris Behrens <span dir="ltr"><<a href="mailto:cbehrens@codestud.com" target="_blank">cbehrens@codestud.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="auto"><div>Ya, there's 2 commits in your branch. If you want to push them both up, it'll create 2 separate reviews with a dependency chain. Just answer 'yes' to the question.</div><div><br></div>
<div>If you meant to push them up separately without a dependency chain, put both commits in separate branches and then git review them individually.</div><div><br></div><div>And if you only meant to submit one review, squash the commits into 1 or remove one of the commits before git reviewing.</div>
<span class="HOEnZb"><font color="#888888"><div><br></div><div>- Chris</div></font></span><div><div class="h5"><div><br>On Apr 19, 2014, at 8:27 PM, Mike Spreitzer <<a href="mailto:mspreitz@us.ibm.com" target="_blank">mspreitz@us.ibm.com</a>> wrote:<br>
<br></div><blockquote type="cite"><div><tt><font>Zhengguang Ou <<a href="mailto:zhengguangou@gmail.com" target="_blank">zhengguangou@gmail.com</a>> wrote on
04/19/2014 11:01:19 PM:<br>
<br>
> Hi all</font></tt>
<br><tt><font>> I used the "git review" to submit a
commit, but I got a error as follow:</font></tt>
<br><tt><font>> You have more than one commit that you are about
to submit.<br>
> The outstanding commits are:</font></tt>
<br><tt><font>> 5dc6eeb (HEAD, Bug1309986) Add unit test for
keypair's api<br>
> d10e307 (review/zhengguang_ou/Bug1307338) Fix the incorrect return
<br>
> messages in keypair-show and keypair-delete</font></tt>
<br><tt><font>> Is this really what you meant to do?</font></tt>
<br><tt><font>> I have run two commands:<br>
> git fetch --all<br>
> git remote update</font></tt>
<br><tt><font>> then ran "git review", but I still
got the same error.</font></tt>
<br><tt><font>> Can you help me please? I would be grateful for
any help.<br>
> Thanks</font></tt>
<br><tt><font>> Regards<br>
> Ou</font></tt>
<br>
<br><tt><font>Please tell us a little more about your situation.
What is the relevant commit history? The error message makes
it look like you are working on two bug fixes. Is that right? If
so, I think you have to submit the two fixes separately.</font></tt>
<br>
<br><tt><font>Regards,</font></tt>
<br><tt><font>Mike</font></tt>
<br></div></blockquote></div></div><blockquote type="cite"><div><span>_______________________________________________</span><div class=""><br><span>Mailing list: <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack</a></span><br>
<span>Post to : <a href="mailto:openstack@lists.openstack.org" target="_blank">openstack@lists.openstack.org</a></span><br><span>Unsubscribe : <a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack</a></span><br>
</div></div></blockquote></div></blockquote></div><br></div>