search

Bioconductor / git-hooks

Bioconductor git hooks which are deployed on every Bioconductor package repository
https://bioconductor.org
MIT License
0 stars 2 forks source link

commit hook checking for conflicts failed to detect conflict in DESCRIPTION #2

Open mtmorgan opened 2 years ago

mtmorgan commented 2 years ago

The hook checking for conflicts allowed me to push this commit, including a conflict surrounding version number

~/b/BiocParallel master$ git show 205e71b651f4c0bf92db5b12c7c64b06b8b4db2b DESCRIPTION
commit 205e71b651f4c0bf92db5b12c7c64b06b8b4db2b
Author: Martin Morgan <Martin.Morgan@RoswellPark.org>
Date:   Fri May 6 17:41:22 2022 -0400

    version bump and NEWS, porting RNG seed stream reset

diff --git a/DESCRIPTION b/DESCRIPTION
index d93a3ce..2f2c5ca 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,11 @@
 Package: BiocParallel
 Type: Package
 Title: Bioconductor facilities for parallel evaluation
+<<<<<<< Updated upstream
 Version: 1.31.1
+=======
+Version: 1.31.3
+>>>>>>> Stashed changes
 Authors@R: c(
     person("Bioconductor Package Maintainer",
         email="maintainer@bioconductor.org", role="cre"),
lshep commented 2 years ago

FWIW I noticed this in a few packages that I had to reach out to correct as well; and also mentioned the hook needed revamping.

lshep commented 1 year ago

It was hard coded for <<<<<<< HEAD
I'm going to try to make it more strict for markers but without branch/source

eg. 

<<<<<<<
=======
>>>>>>>

There might be the very rare false positive is someone has all three of these somewhere in a file but I would consider that rare.

lshep commented 1 year ago

See https://github.com/Bioconductor/git-hooks/commit/4191a7a533a353b3b05ded393bf25bb35af2f287