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