Dear Maintainers,
A new "pre-receive hook" on git.bioconductor.org server has been enabled to
keep the repositories in good shape. The new hook prevents "merge conflict
markers". Please note that the hook is now enabled as of 11:45 AM May 10th
2019.
Git merges sometimes result in conflicts within files which lead to markers like
• <<<<<<< HEAD
• =======
• >>>>>>> new_branch
These cause issues for the repository and leave it in a bad state. We've
noticed a few repositories with such issues over the last release.
If any of you notice issues/errors in your "push" to the bioconductor git
server as a result of this hook, please let me know. Note that, the hook acts
as the first defense against bad commits, before our other hooks come into
play.
The hook will allow all commits to go through if there are no merge conflict
markers. For more information on this, check our documentation on our website,
http://bioconductor.org/developers/how-to/git/resolve-conflicts/. Other
resources,
1. What are merge conflicts -
https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
2. Resolving merge conflicts -
https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line
Best,
Nitesh Turaga
Bioconductor Core Team
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
_______________________________________________
[email protected] mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
