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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Repository
b79378cae8067d6c967770c0a3129e7a9999cc2f
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
resolve_conflicts.md
Find file
Blame
History
Permalink
Add merge conflict docs
· b79378ca
Sean McGivern
authored
Aug 05, 2016
b79378ca
resolve_conflicts.md
1.68 KB
Edit
Web IDE
Replace resolve_conflicts.md
×
Attach a file by drag & drop or
click to upload
Commit message
Replace resolve_conflicts.md
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
