Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Fixing semantic merge conflict
Code
Review changes
Check out branch
Download
Patches
Plain diff
John Cai
requested to merge
jc-fix-semantic-merge-conflict
into
master
Jun 30, 2020
Overview
3
Commits
1
Pipelines
1
Changes
1
Expand
merging
!2292 (merged)
caused a semantic merge conflict. This MR fixes that.
Merge request reports
Loading