duplicate commits #38
Description
when I git push upstream master, it throw the following error:
Counting objects: 2785, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (1643/1643), done.
Writing objects: 100% (2785/2785), 23.15 MiB | 3.46 MiB/s, done.
Total 2785 (delta 1167), reused 2618 (delta 1109)
remote: Resolving deltas: 100% (1167/1167), completed with 44 local objects.
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: <[email protected]>. Provide the error, the package name and
remote: any other details we might need.
remote:
remote: Use
remote:
remote: git show f501cf38e97b6e41dbd590198b7e1aa42b5977c2
remote: git show 0b957fe4917043a24be90df3544874bbfa0cbffd
remote:
remote: to see body of commits.
remote:
To git.bioconductor.org:packages/GOSemSim.git
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to '[email protected]:packages/GOSemSim.git'
Here is the output of the git show.
~/g/GOSemSim ❯❯❯ git show f501cf38e97b6e41dbd590198b7e1aa42b5977c2
commit f501cf38e97b6e41dbd590198b7e1aa42b5977c2
Author: Herve Pages <[email protected]>
Date: Mon Apr 24 19:25:24 2017 +0000
bump x.y.z versions to even y prior to creation of 3_5 branch
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/GOSemSim@129126 bc3139a8-67e5-0310-9ffc-ced21a209358
diff --git a/DESCRIPTION b/DESCRIPTION
index c822a39..96e3313 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: GOSemSim
Type: Package
Title: GO-terms Semantic Similarity Measures
-Version: 2.1.3
+Version: 2.2.0
Authors@R: c(person(given = "Guangchuang", family = "Yu",
email = "[email protected]",
role = c("aut", "cre")),
~/g/GOSemSim ❯❯❯ git show 0b957fe4917043a24be90df3544874bbfa0cbffd
commit 0b957fe4917043a24be90df3544874bbfa0cbffd
Author: Herve Pages <[email protected]>
Date: Mon Apr 24 19:25:24 2017 +0000
bump x.y.z versions to even y prior to creation of 3_5 branch
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/GOSemSim@129126 bc3139a8-67e5-0310-9ffc-ced21a209358
diff --git a/DESCRIPTION b/DESCRIPTION
index c822a39..96e3313 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: GOSemSim
Type: Package
Title: GO-terms Semantic Similarity Measures
-Version: 2.1.3
+Version: 2.2.0
Authors@R: c(person(given = "Guangchuang", family = "Yu",
email = "[email protected]",
role = c("aut", "cre")),
This is out of my intelligence. Can you kindly help solving the issue?