Hello everybody,
I am getting the following error when pushing upstream to the RELEASE
branch:
--> git push upstream RELEASE_3_11
Enumerating objects: 23, done.
Counting objects: 100% (23/23), done.
Delta compression using up to 8 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 4.31 KiB | 1.08 MiB/s, done.
Total 12 (delta 11), reused 0 (delta 0)
remote: Traceback (most recent call last):
remote: File "hooks/pre-receive.h00-pre-receive-hook-software", line 9,
in <module>
remote: from prevent_merge_markers import prevent_merge_markers
remote: File
"/home/git/.gitolite/local/hooks/repo-specific/prevent_merge_markers.py",
line 27
remote: return conflicts
remote: ^
remote: SyntaxError: invalid syntax
To git.bioconductor.org:packages/artMS.git
! [remote rejected] RELEASE_3_11 -> RELEASE_3_11 (pre-receive hook
declined)
error: failed to push some refs to 'g...@git.bioconductor.org:
packages/artMS.git'
The problem is that the file causing the problem is not listed. How can I
know?
Thanks a lot!
David
[[alternative HTML version deleted]]
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
