05480e90f3
Add latest changes from gitlab-org/gitlab@master
2020-07-28 18:09:36 +00:00
0eb3d2f799
Add latest changes from gitlab-org/gitlab@master
2020-02-06 15:09:11 +00:00
80f61b4035
Add latest changes from gitlab-org/gitlab@master
2019-09-18 14:02:45 +00:00
fb9f1e92ed
Single source of truth for merge requests
...
- Edit pages under user/project/merge_requests and
add the relevant types in the frontmatter.
- Clean up descriptions.
Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
2019-06-09 22:25:13 +00:00
1b7ecba0c4
Improve detail of resolve conflict docs
2018-11-28 08:26:49 -05:00
06a2e3854e
Make it explicit that merge conflict feature commits to source branch
2018-05-21 11:36:54 -07:00
b72f43d053
Add docs for resolve conflicts editor
...
[ci skip]
2017-01-24 17:23:47 +01:00
44eb3197a9
Handle non-UTF-8 conflicts gracefully
...
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
2016-08-25 08:27:08 +01:00
2257fda38e
Reference the version 'UI resolve conflicts' was introduced
...
[ci skip]
2016-08-17 15:34:53 +03:00
b79378cae8
Add merge conflict docs
2016-08-12 23:24:49 +03:00
GitLab Bot