[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging release branch
From: |
Dmitry Gutov |
Subject: |
Re: Merging release branch |
Date: |
Sun, 31 Oct 2021 02:17:11 +0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 |
On 31.10.2021 02:14, Gregory Heytings wrote:
Btw, if this is what will make the situation better, we could merge ti
master immediately after pushing to the release branch, by the same
committer.
This could be automated with a server-side hook, whose execution would
depend on some tag in the commit message which would indicate whether
the commit should or should not be merged into the trunk.
If we had a functional and blessed CI service, one of the checks could
verify that the release branch is merge-able to master (using 'git
merge' or even 'gitmerge.el').
And if not, ask the author of the corresponding push to do the merge.
- Re: Merging release branch, (continued)
- Re: Merging release branch, Eli Zaretskii, 2021/10/30
- Re: Merging release branch, Dmitry Gutov, 2021/10/30
- Re: Merging release branch, Eli Zaretskii, 2021/10/30
- Re: Merging release branch, dick, 2021/10/30
- Re: Merging release branch, Dmitry Gutov, 2021/10/31
- Re: Merging release branch, Eli Zaretskii, 2021/10/31
- Re: Merging release branch, Eli Zaretskii, 2021/10/30
- Re: Merging release branch, Dmitry Gutov, 2021/10/30
- Re: Merging release branch, Eli Zaretskii, 2021/10/31
- Re: Merging release branch, Gregory Heytings, 2021/10/30
- Re: Merging release branch,
Dmitry Gutov <=
- Re: Merging release branch, Eli Zaretskii, 2021/10/31
- Re: Merging release branch, Gregory Heytings, 2021/10/31
- Re: Merging release branch, Dmitry Gutov, 2021/10/31
- Re: Merging release branch, Gregory Heytings, 2021/10/31
- Re: Merging release branch, Dmitry Gutov, 2021/10/31
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/31
- Re: Merging release branch, Eli Zaretskii, 2021/10/31
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/31
- Dealing with merge noise (was: Merging release branch), Kévin Le Gouguec, 2021/10/31
- Re: Dealing with merge noise (was: Merging release branch), Stefan Kangas, 2021/10/31