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
9e42df3cd18b437160ba4159a0f9e19f8540756d
Switch branch/tag
gitlab-ce
..
states
mr_widget_conflicts.js
Find file
Blame
History
Permalink
Port semi-linear merge strategy to CE (mostly FE)
· 439e3f07
Eric Eastwood
authored
Sep 29, 2017
439e3f07
mr_widget_conflicts.js
1.35 KB
Edit
Web IDE
Replace mr_widget_conflicts.js
×
Attach a file by drag & drop or
click to upload
Commit message
Replace mr_widget_conflicts.js
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
