Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • P PanTools
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 32
    • Issues 32
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 2
    • Merge requests 2
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • bioinformatics
  • PanTools
  • Merge requests
  • !99

Merge v4.0.0 bugfixes into develop branch

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Workum, Dirk-Jan van requested to merge fix_update_develop_with_v4.0.0_changes into develop Dec 01, 2022
  • Overview 0
  • Commits 38
  • Pipelines 2
  • Changes 30

Since the release_v4.0.0 branch and develop had diverged too much, we had so manually solve the merge conflicts with develop. I fixed those merge conflicts to keep both the bugfixes of release_v4.0.0 and the logging of develop intact. Please do check whether everything still works as expected tho

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: fix_update_develop_with_v4.0.0_changes