<div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>Hey Eike,</div><div>I still have lot many problems. I doesn't allow me to commit.</div><div><br></div><div dir="ltr">********************************************************************************************<br></div><div dir="ltr">komal@komal-Vostro-15-3568:~/Downloads/libo$ ./logerrit submit master<br>Enumerating objects: 15, done.<br>Counting objects: 100% (15/15), done.<br>Delta compression using up to 4 threads<br>Compressing objects: 100% (11/11), done.<br>Writing objects: 100% (11/11), 1.19 KiB | 174.00 KiB/s, done.<br>Total 11 (delta 9), reused 0 (delta 0)<br>remote: Resolving deltas: 100% (9/9)<br>remote: Processing changes: refs: 1, done    <br>To ssh://logerrit/core<br> ! [remote rejected]           HEAD -> refs/for/master (change <a href="https://gerrit.libreoffice.org/65890">https://gerrit.libreoffice.org/65890</a> closed)<br>error: failed to push some refs to 'ssh://logerrit/core'</div><div dir="ltr">*********************************************************************************************</div><div dir="ltr"><br></div><div>I also tried rebase on this link- <a href="https://gerrit.libreoffice.org/#/c/66203/">https://gerrit.libreoffice.org/#/c/66203/</a>.</div><div>But it shows this error-<span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"> <font size="2"><span style="font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none">The change could not be rebased due to a conflict during merge.</span></font></span></span></div><div><font size="2"><span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"><span style="font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none"><br></span></span></span></font></div><div><font size="2"><span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"><span style="font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none">The problem is I haven't done any changes but now I want to resolve this *Cannot .</span></span></span></font></div><div><span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"><span style="font-family:verdana;font-size:15px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none"><span style="font-family:arial,helvetica,sans-serif"><font size="2">Merge* issue given on the link</font>.</span> <br></span></span></span></div><div><span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"><span style="font-family:verdana;font-size:15px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none">After <b>git cherry-pick --continue, </b>what should I do?</span></span></span></div><div>Because I did  ./logerrit submit master, as shown above. But it has errors.</div><div><br></div><div>I have tried almost every possible to commit, but nothing works. Please help!</div><div>I will be really grateful for your help.</div><div><br></div><div>Regards,</div><div>Komal<br></div><div><span style="color:rgb(0,0,0)"><span style="background-color:rgb(255,255,255)"><span style="font-family:verdana;font-size:15px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:pre;word-spacing:0px;text-decoration-style:initial;text-decoration-color:initial;display:inline;float:none"><b></b></span></span></span></div></div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Jan 21, 2019 at 8:58 PM Eike Rathke <<a href="mailto:erack@redhat.com">erack@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Komal,<br>
<br>
On Sunday, 2019-01-20 11:25:58 +0530, Komal Bharadiya wrote:<br>
<br>
> I followed the steps you suggested. I am on the local branch of the<br>
> repository.<br>
> [...]<br>
> komal@komal-Vostro-15-3568:~/Downloads/libo$  git fetch<br>
> <a href="https://git.libreoffice.org/core" rel="noreferrer" target="_blank">https://git.libreoffice.org/core</a> refs/changes/03/66203/2 && git cherry-pick FETCH_HEAD<br>
> [...]<br>
> On branch my_first1<br>
> [...]<br>
> no changes added to commit<br>
> The previous cherry-pick is now empty, possibly due to conflict resolution.<br>
> If you wish to commit it anyway, use:<br>
> <br>
>     git commit --allow-empty<br>
> <br>
> Otherwise, please use 'git reset'<br>
> _____________________________________________________________________________________________________<br>
> komal@komal-Vostro-15-3568:~/Downloads/libo$  git cherry-pick --continue<br>
> On branch my_first1<br>
> [...]<br>
> no changes added to commit<br>
> The previous cherry-pick is now empty, possibly due to conflict resolution.<br>
> [...]<br>
<br>
I deduce that you are on a local branch that still contains the commit<br>
you submitted as change 66203 to gerrit. That's fine, you're almost<br>
there ;-)<br>
<br>
You can then skip the cherry-pick from gerrit because, as git says, it<br>
would result in an empty commit as there are no changes.<br>
<br>
You need to do the second step I mentioned to rebase to current master then:<br>
<br>
> > issue the commands<br>
> ><br>
> >   git fetch<br>
> >   git rebase origin/master<br>
<br>
and resolve the merge conflicts and proceed as described earlier in my<br>
previous mail.<br>
<br>
  Eike<br>
<br>
-- <br>
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A<br>
</blockquote></div>