A partial archive of https://discourse-mediawiki.wmflabs.org as of Saturday May 21, 2022.

Cross-repo dependencies was unable to be automatically merged

Jayprakash12345

Most of the time When I click Rebase. The patch has rebased. But some time I get error like below

jenkins-bot
2:24 AM
↩
Patch Set 9: Verified-1

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.

See https://gerrit.wikimedia.org/r/#/c/405057/

How can I fix this?

It is good to me if someone give answer with commands after

$ git pull
$ git review -d 405057
Tgr

This patch does not have cross-repo dependencies; you just need to rebase your patch so that it can be appied cleanly to the current state of the repository.

E.g.

$ git checkout origin/master
$ git review -x 405057
$ git status
# (edit files to resolve conflicts)
$ git add --update
$ git cherry-pick --continue
$ git review
Jayprakash12345

jay@Jay MINGW64 /c/xampp/htdocs/Dev/core/extensions/Arrays ((2166695…))
$ git review -x 405057
Cannot find symbolic reference
The following command failed with exit code 1
“git symbolic-ref -q HEAD”

Tgr

Hm, then maybe start with

$ git checkout master
$ git reset --hard origin/master
$ git review -x 405057

instead. You will lose all uncommitted changes though. (You can do a git stash first to save them.)

Jayprakash12345

This is working, See https://gerrit.wikimedia.org/r/#/c/405057/, Thank you very much :slight_smile: