<div dir="ltr">After git rebase -i, you need to edit the line of the newer commit to be:<div>squash <SHA1> <commit message><br></div><div><br></div><div>instead of:</div><div>pick <SHA1> <commit message></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 1:18 PM, shubham dubey <span dir="ltr"><<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@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"><div><div>I have run 'git rebase -i HEAD~2' but they doesn't merge.<br></div>I think I need to change pick with edit for merging but I didn't do that, thats why they are still<br></div>separate commit. <br></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 3:37 PM, Martin Perina <span dir="ltr"><<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.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"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Please merge upgrade script into previous patch, otherwise CI will always fail for your patch<br></div></div><div class="m_-5756202899464433915HOEnZb"><div class="m_-5756202899464433915h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 11:57 AM, shubham dubey <span dir="ltr"><<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@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"><div>Done. They are not coming in single page but in related changes.<br><br></div>Thanks<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 3:21 PM, shubham dubey <span dir="ltr"><<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@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"><div>So,what I do for now?<br></div>Can I can now add the new file to previous change?<br></div><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540HOEnZb"><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 3:17 PM, Martin Perina <span dir="ltr"><<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.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"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.<br></div></div><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540m_8412548224129661747HOEnZb"><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540m_8412548224129661747h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 11:43 AM, shubham dubey <span dir="ltr"><<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@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"><div><div>I just use 'git push origin HEAD:refs/for/master'<br></div>but it comes as new commit.<br><br></div>How I merge both? <br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 3:05 PM, Martin Perina <span dir="ltr"><<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.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"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Just add a file into the patch locally and push it again to gerrit, patch will be stored as new patch set.<br></div></div><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540m_8412548224129661747m_-7417976718081427043m_5345765597224563311HOEnZb"><div class="m_-5756202899464433915m_-6584574811167201834m_4391390379577927540m_8412548224129661747m_-7417976718081427043m_5345765597224563311h5"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 11:33 AM, shubham dubey <span dir="ltr"><<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@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"><div><div>yes I just forget to add that.<br>Can anyone tell me how to push the new changes to same commit?<br><br></div>Thanks,<br></div>Shubham<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 23, 2017 at 1:27 PM, Code Review <span dir="ltr"><<a href="mailto:gerrit@ovirt.org" target="_blank">gerrit@ovirt.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From Eli Mesika <<a href="mailto:emesika@redhat.com" target="_blank">emesika@redhat.com</a>>:<br>
<br>
Eli Mesika has posted comments on this change.<br>
<span><br>
Change subject: core: backup flag added to storage domain static<br>
..............................<wbr>..............................<wbr>..........<br>
<br>
<br>
</span>Patch Set 1:<br>
<br>
Did you forgot to add the relevant upgrade script that added that field ????<br>
<span><br>
--<br>
To view, visit <a href="https://gerrit.ovirt.org/77142" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/77142</a><br>
To unsubscribe, visit <a href="https://gerrit.ovirt.org/settings" rel="noreferrer" target="_blank">https://gerrit.ovirt.org/setti<wbr>ngs</a><br>
<br>
</span>Gerrit-MessageType: comment<br>
<span>Gerrit-Change-Id: I1453b52f4330d0e5cb12d8fa08426<wbr>fd68f3cd329<br>
Gerrit-PatchSet: 1<br>
Gerrit-Project: ovirt-engine<br>
Gerrit-Branch: master<br>
Gerrit-Owner: shubham dubey <<a href="mailto:sdubey504@gmail.com" target="_blank">sdubey504@gmail.com</a>><br>
Gerrit-Reviewer: Eli Mesika <<a href="mailto:emesika@redhat.com" target="_blank">emesika@redhat.com</a>><br>
Gerrit-Reviewer: Greg Sheremeta <<a href="mailto:gshereme@redhat.com" target="_blank">gshereme@redhat.com</a>><br>
Gerrit-Reviewer: Jenkins CI<br>
Gerrit-Reviewer: Maor Lipchuk <<a href="mailto:mlipchuk@redhat.com" target="_blank">mlipchuk@redhat.com</a>><br>
Gerrit-Reviewer: Martin Peřina <<a href="mailto:mperina@redhat.com" target="_blank">mperina@redhat.com</a>><br>
Gerrit-Reviewer: gerrit-hooks <<a href="mailto:automation@ovirt.org" target="_blank">automation@ovirt.org</a>><br>
</span>Gerrit-HasComments: No<br>
</blockquote></div><br></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>
</div></div><br>______________________________<wbr>_________________<br>
Devel mailing list<br>
<a href="mailto:Devel@ovirt.org">Devel@ovirt.org</a><br>
<a href="http://lists.ovirt.org/mailman/listinfo/devel" rel="noreferrer" target="_blank">http://lists.ovirt.org/<wbr>mailman/listinfo/devel</a><br></blockquote></div><br></div>