Thanks a lot Siddhart for your reply
On Sat, Feb 5, 2022 at 9:16 PM Siddharth VP siddharthvp@gmail.com wrote:
In that case, the problem is as I mentioned above. Only Trusted-Contributors can edit others' patches.
Here's something you can try but I'm not sure if it will work or not – instead of amending that commit, create a new commit on top of it. (Get a fresh copy of the patch by running "git review -d 716255", and then apply your changes and commit them separately – basically don't use --amend)
On Sat, 5 Feb 2022 at 19:20, Shreyaans Jain shreyaansjain60@gmail.com wrote:
No I am shreyaansjain06 on gerrit I only added the fix docker compose file in git commit -- amend which you can see on git log
Also I forgot to mention one thing maybe that will help you find what mistake I am doing ,like the latest code is not in repo So after cloning the repo i ran this command
git fetch https://shreyaansjain06@gerrit.wikimedia.org/r/a/labs/tools/VideoCutTool refs/changes/55/716255/10 && git checkout FETCH_HEAD
This brings the latest code and i had done changes in this code
On Sat, Feb 5, 2022 at 6:55 PM Siddharth VP siddharthvp@gmail.com wrote:
Ok, so you're actually Khr2003 on Gerrit? Ignore my comment about editing others' patches then.
The patch says there's a merge conflict. Try rebasing the branch with master branch ("git rebase master") before using "git review".
On Sat, 5 Feb 2022 at 18:31, Shreyaans Jain shreyaansjain60@gmail.com wrote:
Sure
On Sat, Feb 5, 2022 at 6:25 PM Siddharth VP siddharthvp@gmail.com wrote:
It looks like you're trying to edit https://gerrit.wikimedia.org/r/c/labs/tools/VideoCutTool/+/716255/ but you can't do that as only members of Trusted-Contributors group are allowed to edit others' patches.
Can you show the output of "git log -1" ?
On Sat, 5 Feb 2022 at 18:00, Shreyaans Jain shreyaansjain60@gmail.com wrote:
Thanks Siddharth for your help Tried all steps you suggested but still facing the remote rejected issue
On Sat, Feb 5, 2022 at 5:16 PM Siddharth VP siddharthvp@gmail.com wrote:
> I did not say to use "git push". For Gerrit, only "git review" > should be used. > > The error in that screenshot is that you're in a detached HEAD state > (9b6fe4f). You should switch to a branch, "git checkout -b branchname", > then "git review" from there. > > On Sat, 5 Feb 2022 at 17:08, Shreyaans Jain < > shreyaansjain60@gmail.com> wrote: > >> I used git push also that was also giving me error >> >> Can you suggest me what should I do? >> >> On Sat, Feb 5, 2022, 17:01 Siddharth VP siddharthvp@gmail.com >> wrote: >> >>> You need to be on a branch to use git review. You cannot use it >>> while in a detached HEAD state. >>> >>> On Sat, 5 Feb 2022 at 16:53, Shreyaans Jain < >>> shreyaansjain60@gmail.com> wrote: >>> >>>> Thanks for your reply >>>> >>>> I followed the steps given in that article but i am still facing >>>> this issue >>>> Can you help me in it? >>>> >>>> On Sat, Feb 5, 2022, 12:05 Andre Klapper aklapper@wikimedia.org >>>> wrote: >>>> >>>>> Hi, >>>>> >>>>> On Sat, 2022-02-05 at 11:57 +0530, Shreyaans Jain wrote: >>>>> > Hey everyone I was working on Videocuttool >>>>> > issue https://phabricator.wikimedia.org/T297992 and now the >>>>> issue is >>>>> > resolved but I am unable to push the patch. I have properly >>>>> > set the ssh key on both my system as well as gerrit and also >>>>> did the >>>>> > steps many times but still facing the problem. It will be >>>>> great if >>>>> > anyone can help me in it . >>>>> >>>>> Please follow https://www.mediawiki.org/wiki/Gerrit/Tutorial >>>>> >>>>> Thanks, >>>>> andre >>>>> -- >>>>> Andre Klapper (he/him) | Bugwrangler / Developer Advocate >>>>> https://blogs.gnome.org/aklapper/ >>>>> _______________________________________________ >>>>> Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org >>>>> To unsubscribe send an email to >>>>> wikitech-l-leave@lists.wikimedia.org >>>>> >>>>> https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/ >>>> >>>> _______________________________________________ >>>> Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org >>>> To unsubscribe send an email to >>>> wikitech-l-leave@lists.wikimedia.org >>>> >>>> https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/ >>> >>> _______________________________________________ >>> Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org >>> To unsubscribe send an email to >>> wikitech-l-leave@lists.wikimedia.org >>> >>> https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/ >> >> _______________________________________________ >> Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org >> To unsubscribe send an email to >> wikitech-l-leave@lists.wikimedia.org >> >> https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/ > > _______________________________________________ > Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org > To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org > > https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org
https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org
https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org
https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org
https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org
https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/
Wikitech-l mailing list -- wikitech-l@lists.wikimedia.org To unsubscribe send an email to wikitech-l-leave@lists.wikimedia.org https://lists.wikimedia.org/postorius/lists/wikitech-l.lists.wikimedia.org/