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
Commits
8c455270
Commit
8c455270
authored
Apr 04, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict in changelogs/unreleased/39880-merge-method-api.yml
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
8cc7570f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
changelogs/unreleased/39880-merge-method-api.yml
changelogs/unreleased/39880-merge-method-api.yml
+0
-4
No files found.
changelogs/unreleased/39880-merge-method-api.yml
View file @
8c455270
---
title
:
'
API:
Add
parameter
merge_method
to
projects'
<<<<<<< HEAD
merge_request
:
=======
merge_request
:
18031
>
>>>>>>
upstream/master
author
:
Jan Beckmann
type
:
added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment