[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging release branch
From: |
Stefan Monnier |
Subject: |
Re: Merging release branch |
Date: |
Fri, 29 Oct 2021 15:00:39 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Lars Ingebrigtsen [2021-10-29 20:26:46] wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> If `emacs-28` was already merged before your commit(s), then it's
>> a small matter of going back to the main branch and doing `git merge
>> emacs-28` or `git merge -s ours emacs-28`.
> That work flow sounds fine to me in general -- but what about those
> changes to emacs-28 that shouldn't be merged?
That's what `git merge -s ours emacs-28` does (it marks the commit as
merged but without bringing any of the corresponding code changes).
Stefan
- Re: Merging release branch, (continued)
- Re: Merging release branch, Daniel MartÃn, 2021/10/30
- Re: Merging release branch, Eli Zaretskii, 2021/10/29
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/30
- 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, Eli Zaretskii, 2021/10/30
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/30
- Re: Merging release branch, Eli Zaretskii, 2021/10/30
- Re: Merging release branch,
Stefan Monnier <=
- Re: Merging release branch, Lars Ingebrigtsen, 2021/10/29
- Re: Merging release branch, Stefan Monnier, 2021/10/29
- Re: Merging release branch, David Engster, 2021/10/29
Re: Merging release branch, dick, 2021/10/29