[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging changes from emacs-24 to master
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Merging changes from emacs-24 to master |
|
Date: |
Sun, 16 Nov 2014 05:38:44 +0200 |
> Date: Sat, 15 Nov 2014 14:18:34 -0700
> From: Christoph <address@hidden>
>
> I just added rev b6cd03a to the emacs-24 branch (adding a file to .gitignore).
> The same issue needs to be fixed in master. What is the procedure to get the
> change from emacs-24 to master? Just cherry-pick the change? What about the
> Changelog? Is it expected to be merged in also? Or will there be a periodic
> bulk merge from emacs-24 to master?
There's no procedure yet. When there will be, it will be based on
merges, like with bzr.