[Bioc-devel] "Duplicate commits" after when pushing change right after doing a clean `git clone git at git.bioconductor.org:packages/chimeraviz`

Stian Lågstad stianlagstad at gmail.com
Sat Jan 13 18:35:00 CET 2018


Could someone help me get past the duplicate commits error? I'm not sure
what to do.

These are the steps I've taken:

1. Clone the repository. `git clone git at git.bioconductor.org:packa
2. Make a small change in master + attempt to push it, and got this:
➜  chimeraviz-bioconductor git:(master) git push

Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 422 bytes | 0 bytes/s, done.

Total 4 (delta 3), reused 0 (delta 0)
remote: Error: duplicate commits.
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: Take a look at the documentation to fix this,
remote: https://bioconductor.org/developers/how-to/git/sync-
remote: particularly, point #8 (force Bioconductor master to Github master).
remote: For more information, or help resolving this issue, contact
remote: <bioc-devel at r-project.org>. Provide the error, the package name and
remote: any other details we might need.
remote: Use
remote:     git show 248742bd41a1b1d862d29e612baa067c50c55e5b
remote:     git show 81ee14920be186caf4f2949e7dacfad68db64ed2
remote: to see body of commits.
To git at git.bioconductor.org:packages/chimeraviz

 ! [remote rejected] master -> master (pre-receive hook declined)

I do see what looks like duplicate commits in the git log. For
example ba964db26ac49e86a5374e0dc3040769ae799113
and 8a49e3cdd1ce5257879d752aeead83813c6a4044, which are both from Sat Apr 8
17:45:42 2017. But I've been successful in making changes after april last

Stian Lågstad
+47 41 80 80 25

	[[alternative HTML version deleted]]

More information about the Bioc-devel mailing list