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
ba374a5a35b5fbe3c5c2e05b3e8a3a20d40fa331
Switch branch/tag
gitlab-ce
doc
user
project
merge_requests
img
History
Find file
Select Archive Format
Source code
Download zip
Download tar.gz
Download tar.bz2
Download tar
Add docs for resolve conflicts editor
· b72f43d0
...
Achilleas Pipinellis
authored
Jan 24, 2017
[ci skip]
b72f43d0
Name
Last commit
Last update
..
cherry_pick_changes_commit.png
Loading commit data...
cherry_pick_changes_commit_modal.png
Loading commit data...
cherry_pick_changes_mr.png
Loading commit data...
cherry_pick_changes_mr_modal.png
Loading commit data...
commit_compare.png
Loading commit data...
conflict_section.png
Loading commit data...
discussion_view.png
Loading commit data...
discussions_resolved.png
Loading commit data...
merge_conflict_editor.png
Loading commit data...
merge_request_diff.png
Loading commit data...
merge_request_widget.png
Loading commit data...
merge_when_build_succeeds_enable.png
Loading commit data...
merge_when_build_succeeds_only_if_succeeds_msg.png
Loading commit data...
merge_when_build_succeeds_only_if_succeeds_settings.png
Loading commit data...
merge_when_build_succeeds_status.png
Loading commit data...
only_allow_merge_if_all_discussions_are_resolved.png
Loading commit data...
only_allow_merge_if_all_discussions_are_resolved_msg.png
Loading commit data...
preview_issue_for_discussions.png
Loading commit data...
resolve_comment_button.png
Loading commit data...
resolve_discussion_button.png
Loading commit data...
resolve_discussion_issue_notice.png
Loading commit data...
resolve_discussion_open_issue.png
Loading commit data...
revert_changes_commit.png
Loading commit data...
revert_changes_commit_modal.png
Loading commit data...
revert_changes_mr.png
Loading commit data...
revert_changes_mr_modal.png
Loading commit data...
versions.png
Loading commit data...
versions_compare.png
Loading commit data...
versions_dropdown.png
Loading commit data...
versions_system_note.png
Loading commit data...
wip_blocked_accept_button.png
Loading commit data...
wip_mark_as_wip.png
Loading commit data...
wip_unmark_as_wip.png
Loading commit data...