On Thu, 2017-02-02 at 16:46 +0100, Michael Hrivnak wrote:
> This comes up periodically, and we've had split opinions for a long
> time. I've been in the camp that likes merging, and finds it
> intuitive. But I'm open to trying cherry-picking since there is a lot
> of interest.
>
> I must admit, I
I think the merging forward seems pretty straightforward as well (with some
exceptions) but one of the my concerns is expecting community contributors
to know our process, the last release branch, etc when they open a PR.
Maybe this isn’t something to worry about though if we don’t have enough
cont
This comes up periodically, and we've had split opinions for a long time.
I've been in the camp that likes merging, and finds it intuitive. But I'm
open to trying cherry-picking since there is a lot of interest.
I must admit, I am always surprised when people describe merging forward as
complicate
The main concern for me is how to track the cherry picks in Redmine. Using
the rebase and merge approach, or if Github had a dedicate cherry pick
feature, we still need a way in Redmine to know if any given bugfix has
been applied to older release streams, i.e. the current bugfix release
stream.
O
