Skip to content

GitLab

Menu

Projects Groups Snippets

Loading...
Help
Sign in

MC Job Options
Project information
- Project information
- Activity
- Labels
- Members
Repository
- Repository
- Files
- Commits
- Branches
- Tags
- Contributors
- Graph
- Compare
- Locked Files
Issues 1
- Issues 1
- List
- Boards
- Service Desk
- Milestones
- Iterations
Jira
- Jira
Merge requests 9
- Merge requests 9
CI/CD
- CI/CD
- Pipelines
- Jobs
- Schedules
Deployments
- Deployments
- Environments
- Releases
Monitor
- Monitor
- Incidents
Packages & Registries
- Packages & Registries
- Package Registry
- Container Registry
- Infrastructure Registry
Analytics
- Analytics
- Value stream
- CI/CD
- Code review
- Issue
- Repository
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards

Collapse sidebar

atlas-physics
pmg
MC Job Options
Merge requests
!56

Closed

Created Sep 23, 2019 by Christian Gutschow @cgutschoMaintainer

Report abuse

resolve conflicts

Overview 0
Commits 3
Pipelines 1
Changes 3

trying to resolve issues seen in !54 (merged)

Assignee

Assign to

Reviewer

Request review from

Time tracking

Source branch: cg_resolve_conflicts