On Tue, Mar 22, 2016 at 10:22:24AM +0100, Víctor M. Jáquez L. wrote:
On 03/21/16 at 12:00pm, Karel Zak wrote:
> On Thu, Jan 07, 2016 at 07:18:16AM -0800, Thomas Klausner wrote:
> > Please merge the changes and make a release based on that version Thank you!
>
> I'll very probably merge stuff from neomutt/mutt-kz (from Richard
> Russon). The result should be mutt-kz synced with the current mutt
> upstream.
>
> It seems that after years mutt upstream is again active, so it's
> probably good idea to regularly rebase our changes to keep things up
> to date. (It means that "git pull --force" or so will be necessary to
> fetch mutt-kz.)
But that would break the release process. How you could tag a release if we
will always rebase the projects patches?
Good point, then we can create a separate branch for each release and
maintain (and tag) the release in the branch without rebases. The
rebase should be possible in the master (=development) branch only.
Karel
--
Karel Zak <kzak(a)redhat.com>
http://karelzak.blogspot.com