Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
E
ensembl-otter
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Jira
    • Jira
  • Merge Requests 3
    • Merge Requests 3
  • Requirements
    • Requirements
    • List
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Security & Compliance
    • Security & Compliance
    • Dependency List
    • License Compliance
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • ensembl-gh-mirror
  • ensembl-otter
  • Merge Requests
  • !119

Merged
Opened Jul 02, 2020 by Marek Szuba@mksOwner

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "bugfix/zmap_fetchdb" "origin/bugfix/zmap_fetchdb"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "test_server_client"
git merge --no-ff "bugfix/zmap_fetchdb"

Step 4. Push the result of the merge to GitLab

git push origin "test_server_client"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Changes made for fetchdb to work in ZMap

  • Overview 0
  • Commits 1
  • Changes 1

Created by: s-mm

FetchDB in ZMap and Blixem did not work because of Sanger authentication in the code. This has been resolved by removing those code lines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: ensembl-gh-mirror/ensembl-otter!119
Source branch: bugfix/zmap_fetchdb