Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Repository
ac242673856fa6fb27998c97a52bc280a7f847cf
Switch branch/tag
gitlab-ce
app
assets
javascripts
diffs
components
merge_conflict_warning.vue
Find file
Blame
History
Permalink
Extract Merge Request Conflicts warning to component
· ac242673
Thomas Randolph
authored
Sep 01, 2020
ac242673
merge_conflict_warning.vue
1.54 KB
Edit
Web IDE
Replace merge_conflict_warning.vue
×
Attach a file by drag & drop or
click to upload
Commit message
Replace merge_conflict_warning.vue
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
