Cédric Krier pushed to branch branch/default at Tryton / Website
Commits: 22d532ae by Cédric Krier at 2023-06-22T19:18:44+02:00 Add warning about rebase frequency - - - - - 2c8d184e by Cédric Krier at 2023-06-23T16:27:44+00:00 reword - - - - - 1 changed file: - templates/develop.html Changes: ===================================== templates/develop.html ===================================== @@ -59,6 +59,7 @@ <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> </section> <section> <h2 id="guidelines">Guidelines</h2> View it on Heptapod: https://foss.heptapod.net/tryton/website/-/compare/c16cebb2496741cfb11d8d3e3142d1122a6b3d65...2c8d184ef1b5109c5ec16ad5f1d7f92fde651ef2 -- View it on Heptapod: https://foss.heptapod.net/tryton/website/-/compare/c16cebb2496741cfb11d8d3e3142d1122a6b3d65...2c8d184ef1b5109c5ec16ad5f1d7f92fde651ef2 You're receiving this email because of your account on foss.heptapod.net.