Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Merge requests
!1390
Catch up with Main
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Catch up with Main
conflict_check
into
2.8.2-DEVELOPMENT
Overview
0
Commits
61
Pipelines
3
Changes
43
Merged
Charlotte Hausman
requested to merge
conflict_check
into
2.8.2-DEVELOPMENT
1 year ago
Overview
0
Commits
61
Pipelines
3
Changes
43
Expand
catch development up with main. check for conflicts
0
0
Merge request reports
Compare
2.8.2-DEVELOPMENT
version 2
c2843976
1 year ago
version 1
02e0cd3c
1 year ago
2.8.2-DEVELOPMENT (base)
and
version 2
latest version
de48dc74
61 commits,
1 year ago
version 2
c2843976
60 commits,
1 year ago
version 1
02e0cd3c
59 commits,
1 year ago
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
43
Search (e.g. *.vue) (Ctrl+P)
Loading