[Bioc-devel] pre-receive hook won't let me fix (very) old merge conflict

[Alyssa Frazee]

Hello!

I have an old package up on Bioconductor, and as I was dusting it off
fixing a build error this weekend, I ran into an issue where a commit with
merge conflict markers (>>>>, ====, etc) was introduced into my repo in
2016. My new diff removes those characters and fixes the conflict, but I'm
not able to push the fix to the git using git.bioconductor.org remote because the
diff itself contains those characters, which is not allowed by pre-receive
hooks (even if they are being removed and not added):
https://github.com/Bioconductor/git-hooks/blob/916f2fd1ddc5f461f14ba8d7cb9fc077aea37e44/prevent_merge_markers.py#L96

Is there a workaround for this? (any way to temporarily disable the hook to
get out of a bad state? also open to other suggestions!)

Thanks so much!
-Alyssa

details: package is polyester, commit containing the merge conflict
characters is 2306e5b3e88c6156e091ff5cb9933a190f45d33c (2016-06-01) in the
.travis.yml file, which isn't important for actual package
functionality (but was being used on the github side).

	[[alternative HTML version deleted]]