8028f2458d
Fix documentation for automatic merging
...
The strategy name and interval was incorrect, and the link back to the
developer documentation was in the wrong place.
2018-12-13 14:50:41 +01:00
8d99636eff
Update automatic merging documentation
...
We're moving from merging + reverting to only merging with the `ours`
strategy, removing the need for merge requests or reverting conflicts.
For more details, refer to Merge Train merge request
https://gitlab.com/gitlab-org/merge-train/merge_requests/6 .
2018-12-11 14:03:06 +01:00
191d5ab440
Updated documentation of CE to EE merges
...
This updates the documentation of automatic CE to EE merges to cover the
new automatic merging setup.
2018-12-04 14:40:08 +01:00
9177beead7
Instruct against squashing in CE to EE MRs
2018-11-23 17:00:38 +01:00
109cfd951d
Correct grammar (setup to set-up) in Docs
2018-09-21 16:29:14 +02:00
b0be58a1b3
Resolve "CE documentation is not CommonMark compliant"
2018-09-06 16:52:18 +00:00
7a56f0e93a
Update git rerere link in docs
...
The original link was moved.
2018-08-07 01:13:16 -07:00
9ede3a669c
Docs guidelines: cherry-picking commits from CE to EE
2018-03-06 16:34:05 +00:00
a51dea0d43
Improve doc/development/automatic_ce_ee_merge.md
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-01 13:37:47 +01:00
0cbbb08e79
doc: Spelling fixes
2018-01-19 12:09:59 +02:00
b79a878d11
Remove a header level in the new 'Automatic CE->EE merge' doc
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-11 12:30:07 +01:00
dd0223f530
Address Robert's and Axil's feedback
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-06 16:30:03 +01:00
aaf1699730
Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-12-05 17:49:49 +01:00
Yorick Peterse