Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ebrains-spack-builds
Manage
Activity
Members
Labels
Plan
Issues
30
Issue boards
Milestones
Wiki
Code
Merge requests
32
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EBRAINS RI
Tech Hub
Platform
EBRAINS Software Distribution
ebrains-spack-builds
Merge requests
!144
Add conflict statement to sda as suggested
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add conflict statement to sda as suggested
thielblz/ebrains-spack-builds:sda
into
master
Overview
5
Commits
2
Pipelines
0
Changes
2
Merged
Lorenz Thielbeer
requested to merge
thielblz/ebrains-spack-builds:sda
into
master
2 years ago
Overview
5
Commits
2
Pipelines
0
Changes
2
Expand
As suggested by
@emuller
(sorry for the mention spam today...), I added a conflict statement.
Edited
2 years ago
by
Lorenz Thielbeer
0
0
Merge request reports
Activity
All activity
Filter activity
Deselect all
Approvals
Assignees & reviewers
Comments (from bots)
Comments (from users)
Commits & branches
Edits
Labels
Lock status
Mentions
Merge request status
Tracking
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Please
register
or
sign in
to reply