Error while pushing a merge commit to gerrit

[Charlie]

Hi

I am trying to do a branch merge from a dev branch to main branch by doing a git merge -no-ff  dev on the master branch, this created a merge commit and the associated commits on the master branch, the git log on master has some changes that are already merged and throwing the below error, how do I get around this and raise a gerrit from the merge commit?

 ! [remote rejected]     HEAD -> refs/for/main(change https://gerrit.com/61993 closed)

[Matthias Sohn]

On Fri, Mar 10, 2023 at 5:56 PM Charlie <itsch...@gmail.com> wrote:

Hi

I am trying to do a branch merge from a dev branch to main branch by doing a git merge -no-ff  dev on the master branch, this created a merge commit and the associated commits on the

Provide a version graph with the local branches and remote tracking branches and let us know which branch 

is checked out before you run git merge --no-ff dev. And first run git fetch origin to ensure the remote tracking

branches in your clone match the corresponding upstream branches.

 

master branch, the git log on master has some changes that are already merged and throwing the below error, how do I get around this and raise a gerrit from the merge commit?

 ! [remote rejected]     HEAD -> refs/for/main(change https://gerrit.com/61993 closed)

--
--
To unsubscribe, email repo-discuss...@googlegroups.com
More info at http://groups.google.com/group/repo-discuss?hl=en

---
You received this message because you are subscribed to the Google Groups "Repo and Gerrit Discussion" group.
To unsubscribe from this group and stop receiving emails from it, send an email to repo-discuss...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/repo-discuss/83edcc25-a8a0-4f53-aada-99bc88497ab2n%40googlegroups.com.