BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Repository
edbdb94e95a537bce841a14b41d217b1562607e1
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
resolve_conflicts.md
Find file
Blame
History
Permalink
Make it explicit that merge conflict feature commits to source branch
· 06a2e385
Annabel Dunstone Gray
authored
May 11, 2018
06a2e385
resolve_conflicts.md
2.28 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.
