[Bioc-devel] Issues with push on release branch
g|u||@p@|@1 @end|ng |rom gm@||@com
Wed Feb 3 17:31:48 CET 2021
I'm trying to push updates to the release 3.12 branch of the
bioconductor repo but I got an odd error from git:
remote: Error: You cannot push without resolving merge conflicts.
remote: Please check the files in the commit pushed to the git-server
remote: for merge conflict markers like '<<<<<<<', '========', '>>>>>>>'.
! [remote rejected] RELEASE_3_12 -> RELEASE_3_12 (pre-receive hook
error: failed to push some refs to
Of course I checked and there are no merge conflicts (I already pushed
the same files on origin and they're the same as the devel branch which
gave me no error of sort). What should I do?
More information about the Bioc-devel