<div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div>Hey Eike, <br></div><div>Thank you so much for the help!</div><div>I followed the steps you suggested. I am on the local branch of the repository.<br></div><div><br></div><div>After the <b> git rebase origin/master step, </b>I get all this on the terminal.<br><b></b></div><div>********************************************************************************************************************************************************</div><div>komal@komal-Vostro-15-3568:~/Downloads/libo$ git fetch <a href="https://git.libreoffice.org/core">https://git.libreoffice.org/core</a> refs/changes/03/66203/2 && git cherry-pick FETCH_HEAD<br>From <a href="https://git.libreoffice.org/core">https://git.libreoffice.org/core</a><br> * branch refs/changes/03/66203/2 -> FETCH_HEAD<br>Performing inexact rename detection: 100% (35178/35178), done.<br>On branch my_first1<br>You are currently cherry-picking commit 40c717b6d00a.<br><br>Changes not staged for commit:<br> modified: helpcontent2 (new commits)<br><br>Untracked files:<br> 0001-simplify-ScChangeTrack-queues.patch<br><br><br>It took 15.61 seconds to enumerate untracked files. 'status -uno'<br>may speed it up, but you have to be careful not to forget to add<br>new files yourself (see 'git help status').<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'</div><div>_____________________________________________________________________________________________________<br></div><div>komal@komal-Vostro-15-3568:~/Downloads/libo$ git cherry-pick --continue<br>On branch my_first1<br>You are currently cherry-picking commit 40c717b6d00a.<br><br>Changes not staged for commit:<br> modified: helpcontent2 (new commits)<br><br>Untracked files:<br> 0001-simplify-ScChangeTrack-queues.patch<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'</div><div>_______________________________________________________________________________________________________<br></div><div>komal@komal-Vostro-15-3568:~/Downloads/libo$ git commit --allow-empty<br>[my_first1 94f5fecef1fe] tdf#114441 Change in the Data Type to Sal_uInt32<br> Date: Sat Jan 12 08:16:18 2019 +0530<br><br></div><div>*********************************************************************************************************************************************</div><div>I don't understand what to do next. But I want to submit my first commit. <br></div><div><br></div><div>Please help! I also tried <b> ./logerrit submit master. </b>But I get this! :/<br><b></b></div><div>*********************************************************************************************************************************************<br></div><div>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.22 KiB | 208.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'<br>*****************************************************************************************************************************</div><div><br></div><div>Link to my commit---</div><div><a href="https://gerrit.libreoffice.org/#/c/66203/">https://gerrit.libreoffice.org/#/c/66203/</a></div><div><br></div><div>Thanking you in anticipation!</div><div><br></div><div>Regards,</div><div>Komal<br></div></div></div></div></div><br><div class="gmail_quote"><div dir="ltr">On Sat, Jan 19, 2019 at 3:42 AM 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 Friday, 2019-01-18 08:31:53 +0530, Komal Bharadiya wrote:<br>
<br>
> I have been working on my first commit. But I am not able to rework on my<br>
> patch.<br>
> I get this on my terminal--<br>
> ********************************************************************************************<br>
> To ssh://logerrit:29418/core<br>
> ! [remote rejected] HEAD -> refs/publish/master/66203 (you are<br>
> not allowed to upload merges)<br>
> error: failed to push some refs to 'ssh://komalbharadiya@logerrit<br>
> :29418/core'<br>
> *********************************************************************************************<br>
> Please help, how do I resolve *CANNOT MERGE* issue?<br>
<br>
It could had helped if you described exactly how you manoeuvred yourself<br>
into that situation, i.e. which sequence of commands lead to a merge<br>
commit that can't be pushed. Anyway..<br>
<br>
First put aside (just in case your existing conflict resolution could be<br>
reused or would come handy when resolving the merge conflict again) and<br>
throw away your current commit(s); assuming that you are on your local<br>
master do<br>
<br>
git log<br>
<br>
Your conflict resolution probably is the second commit and the HEAD<br>
commit is the merge commit. If so, then<br>
<br>
git format-patch -1 HEAD~1<br>
<br>
which writes some 0001-your-commit-summary.patch file. Then<br>
<br>
git reset --hard HEAD~2<br>
<br>
which throws away the topmost 2 commits. If your commit history is<br>
different then please adjust the commands. Then<br>
<br>
git pull -r<br>
<br>
to pull and rebase master to current state (probably you omitted the -r<br>
to some pull in some stage earlier which lead to the merge)<br>
<br>
Then cherry-pick the gerrit change with<br>
<br>
git fetch <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>
This should lead to an error message about merge conflicts.<br>
Resolve the merge conflicts. When done<br>
<br>
git cherry-pick --continue<br>
<br>
If the change is commited and builds you can push to gerrit.<br>
<br>
<br>
If the earlier assumption that you are on your local master does not<br>
hold but you are on a local branch instead (which is advisable), then<br>
proceed the same but instead of<br>
<br>
git pull -r<br>
<br>
issue the commands<br>
<br>
git fetch<br>
git rebase origin/master<br>
<br>
Hope that helps.<br>
<br>
Eike<br>
<br>
-- <br>
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A<br>
</blockquote></div>