Hello Maintainers, We have recently come across some experiment data packages that had merge conflicts in them.
As a precaution, the git hook to prevent these merge conflicts has been enabled. This will keep merge conflict markers from entering the git repositories we maintain. Maintainers should be aware and make sure there are no merge conflict markers before making a commit to the git repositories. Some links about resolving merge conflicts: 1. https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line 2. https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts 3. Bioconductor git hooks: https://github.com/Bioconductor/git-hooks If you have any questions, please reply to this thread. Best regards, Nitesh Nitesh Turaga Scientist II, Department of Data Science, Bioconductor Core Team Member Dana Farber Cancer Institute _______________________________________________ Bioc-devel@r-project.org mailing list https://stat.ethz.ch/mailman/listinfo/bioc-devel
