details: https://code.tryton.org/communication/website/commit/01e12f448b78
branch: default
user: Cédric Krier <[email protected]>
date: Thu Jul 09 13:56:18 2026 +0200
description:
Remove warning about conflict with CHANGELOG
The `internal:union-other-first` `merge-pattern` has been configured for
CHANGELOG which avoid conflict.
diffstat:
templates/develop.html.jinja | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diffs (11 lines):
diff -r d9dd045eca17 -r 01e12f448b78 templates/develop.html.jinja
--- a/templates/develop.html.jinja Tue Jul 07 23:22:02 2026 +0200
+++ b/templates/develop.html.jinja Thu Jul 09 13:56:18 2026 +0200
@@ -59,7 +59,6 @@
<li style="list-style-type: '↻ ';">Resolve all threads opened by
reviewers.</li>
<li>Once accepted your merge request is merged by a Mercurial
Publisher.</li>
</ul>
- <p class="alert alert-warning rounded">There is no need to rebase merge
requests too often, even when there are conflicts, as this is often just for
CHANGELOG entries.</p>
<p class="alert alert-info rounded">To ease the review process, avoid
pushing rebase and modifications at the same time and set a note when amending
a changeset.</p>
<p class="alert alert-info rounded">To avoid consuming CI resources, mark
the merge request as a draft until it is ready.</p>
</section>
