+1 IMO i prefer to rebase and check the commit i push in my local repo.
Thanks Le 11 mars 2020 16:52:36 GMT+01:00, Mathieu Lirzin <mathieu.lir...@nereide.fr> a écrit : >>> The simple solution to prevent this is to get into the habit of >>> linearizing history, meaning always rebasing and clean history >before >>> merging into trunk. >> >> I guess the GH merge button option "Rebase and merge" is what we are >> looking to enforce with the request to Infra, right? > >I personnally think we should have *no button* because the committers >should cleanup the commits (reword, squash, ...) before merging to >trunk, but "rebase and merge" is an improvement compared to basic >"merge". -- Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
