<div dir="ltr">Hey,<br><br><div class="gmail_quote"><div dir="ltr">On Tue, Aug 28, 2018 at 6:36 PM Rahul Gurung <<a href="mailto:gurungrahul2@gmail.com">gurungrahul2@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">How to do that, because rebasing twice doesn't seems possible?<br></div></blockquote><div><br></div><div><br></div><div>You need at least one new commit on master, otherwise rebasing is not possible. So unless you try to rebase quickly after each other it should be possible.<br></div><div><br></div><div>Regards,</div><div>Markus<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"></div><div class="gmail_extra"><br><div class="gmail_quote">On 28 August 2018 at 21:27, Markus Mohrhard <span dir="ltr"><<a href="mailto:markus.mohrhard@googlemail.com" target="_blank">markus.mohrhard@googlemail.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">Hey,<br><br><div class="gmail_quote"><span><div dir="ltr">On Tue, Aug 28, 2018 at 5:52 PM Rahul Gurung <<a href="mailto:gurungrahul2@gmail.com" target="_blank">gurungrahul2@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">What if it hiccups again in rebase ?<br></div></blockquote><div><br></div><div><br></div></span><div>Rebase again. Sadly some of the tests are not as stable as they should be. Some of the old java tests and some of the platform dependent tests (either font based, or other platform parts) fail from time to time.</div><div><br></div><div>Just make sure that you are not causing the test failure before rebasing.</div><div><br></div><div>Regards,</div><div>Markus</div><span><div><br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"></div><div class="gmail_extra"><br><div class="gmail_quote">On 27 August 2018 at 19:11, Muhammet Kara <span dir="ltr"><<a href="mailto:muhammet.kara@pardus.org.tr" target="_blank">muhammet.kara@pardus.org.tr</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
<p>Hi Rahul,</p><span>
<br>
<div class="m_5188918392795453759m_-4283409659610717621m_8704623469832202445m_1606836819966271637moz-cite-prefix">On 08/27/2018 01:58 PM, Rahul Gurung
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">hey,
<div><br>
</div>
<div>Why do we get that "<span style="color:rgb(0,0,0);font-family:sans-serif;font-size:small;white-space:pre-wrap;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">junit test JunitTest_framework_complex failed" message when we upload a patch and weird thing is it gets fixed by a rebase? which rebase is recommended, normal or ticking that option we get ? sorry im a newbie.</span></div>
</div>
</blockquote>
<br></span>
It is not something standard. Our Jenkins sometimes hiccups, which
causes such failures; and a rebase usually solves the issue for you
by triggering another build (with the latest commits).<br>
<br>
<blockquote type="cite">
<div dir="ltr">
<div><span style="color:rgb(0,0,0);font-family:sans-serif;font-size:small;white-space:pre-wrap;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">
</span></div>
<div><span style="color:rgb(0,0,0);font-family:sans-serif;font-size:small;white-space:pre-wrap;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">Thanks,</span></div>
<div><span style="color:rgb(0,0,0);font-family:sans-serif;font-size:small;white-space:pre-wrap;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">RG</span></div>
</div>
<br>
<fieldset class="m_5188918392795453759m_-4283409659610717621m_8704623469832202445m_1606836819966271637mimeAttachmentHeader"></fieldset>
<br>
<pre>_______________________________________________
LibreOffice mailing list
<a class="m_5188918392795453759m_-4283409659610717621m_8704623469832202445m_1606836819966271637moz-txt-link-abbreviated" href="mailto:LibreOffice@lists.freedesktop.org" target="_blank">LibreOffice@lists.freedesktop.org</a>
<a class="m_5188918392795453759m_-4283409659610717621m_8704623469832202445m_1606836819966271637moz-txt-link-freetext" href="https://lists.freedesktop.org/mailman/listinfo/libreoffice" target="_blank">https://lists.freedesktop.org/mailman/listinfo/libreoffice</a>
</pre>
</blockquote>
<br>
Best,<br>
Muhammet
</div>
</blockquote></div><br></div>
_______________________________________________<br>
LibreOffice mailing list<br>
<a href="mailto:LibreOffice@lists.freedesktop.org" target="_blank">LibreOffice@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/libreoffice" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/libreoffice</a><br>
</blockquote></span></div></div>
</blockquote></div><br></div>
</blockquote></div></div>