I'm trying to push a new branch with some changes to origin, but I'm
getting this error:

```
➜  chimeraviz-bioconductor git:(starfusionffpm) git push --set-upstream
origin starfusionffpm
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 998 bytes | 0 bytes/s, done.

Total 7 (delta 5), reused 0 (delta 0)
remote: Error: duplicate commits.
remote:
remote: There are duplicate commits in your commit history, These cannot be
remote: pushed to the Bioconductor git server. Please make sure that this is
remote: resolved.
remote:
remote: Take a look at the documentation to fix this,
remote:
https://bioconductor.org/developers/how-to/git/sync-existing-repositories/,
remote: particularly, point #8 (force Bioconductor master to Github master).
remote:
remote: For more information, or help resolving this issue, contact
remote: <bioc-devel@r-project.org>. Provide the error, the package name and
remote: any other details we might need.
remote:
remote: Use
remote:
remote:     git show 248742bd41a1b1d862d29e612baa067c50c55e5b
remote:     git show 81ee14920be186caf4f2949e7dacfad68db64ed2
remote:
remote: to see body of commits.
remote:
To g...@git.bioconductor.org:packages/chimeraviz

 ! [remote rejected] starfusionffpm -> starfusionffpm (pre-receive hook
declined)
error: failed to push some refs to 'g...@git.bioconductor.org:
packages/chimeraviz'
```

I'm not syncing anything with an existing Github repository. I just wanted
to store a couple of changes that I might merge into master later.

I haven't done anything locally since my last successful push to master, so
I should be in sync:
```
➜  chimeraviz-bioconductor git:(starfusionffpm) git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
➜  chimeraviz-bioconductor git:(master) git pull
Already up-to-date.
➜  chimeraviz-bioconductor git:(master) git branch -a
  RELEASE_3_6
* master
  starfusionffpm
  remotes/origin/HEAD -> origin/master
  remotes/origin/RELEASE_3_5
  remotes/origin/RELEASE_3_6
  remotes/origin/master
➜  chimeraviz-bioconductor git:(master) git checkout RELEASE_3_6
Switched to branch 'RELEASE_3_6'
Your branch is up-to-date with 'origin/RELEASE_3_6'.
➜  chimeraviz-bioconductor git:(RELEASE_3_6) git pull
Already up-to-date.
```

Are we allowed to push new branches to Bioconductor, or should we avoid
doing that?

-- 
Stian Lågstad
+47 41 80 80 25

        [[alternative HTML version deleted]]

_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel

Reply via email to