Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

8c0e358a

Commit 8c0e358a authored 8 years ago by Achilleas Pipinellis

Downloads
- Plain Diff

Merge branch 'docs/conflict-editor' into 'master'

Add docs for resolve conflicts editor

See merge request !8748

parents c66c3a46 b72f43d0

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

doc/user/project/merge_requests/img/merge_conflict_editor.png 0 additions, 0 deletions

...user/project/merge_requests/img/merge_conflict_editor.png
doc/user/project/merge_requests/resolve_conflicts.md 12 additions, 0 deletions

doc/user/project/merge_requests/resolve_conflicts.md

with 12 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment