diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-10 15:21:43 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-12-11 14:03:06 +0100 |
| commit | 8d99636eff5889ddec080ea00fd7a2ee6c911179 (patch) | |
| tree | 9c9a9ca9d72a4138ac17838e1fc304eee077f35b /app/mailers | |
| parent | 955b4b92647f28ca2472c4cf29329673c7c65570 (diff) | |
| download | gitlab-ce-8d99636eff5889ddec080ea00fd7a2ee6c911179.tar.gz | |
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.
Diffstat (limited to 'app/mailers')
0 files changed, 0 insertions, 0 deletions