cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject Re: applying fixes, after 4.6 is out
Date Fri, 30 Oct 2015 11:40:04 GMT
valid question but is this more work in comparison to having the
contribution be refused on the grounds of not being on the right version?
We encounter a conflict and then bring it back to the contributor...
further flow is untouched. agree?

On Fri, Oct 30, 2015 at 11:55 AM, Boris Schrijver <boris@pcextreme.nl>
wrote:

> Good idea! If there aren't any merge conflicts we could even automate it
> by means of a script.
>
> Though, who's responsible if there are conflicts? Extra work, testing
> against the other branch?
>
> On October 30, 2015 at 11:45 AM Daan Hoogland <daan.hoogland@gmail.com>
> wrote:
>
>
> H,
>
> Being kind of an optimist sometimes I want to start talking on how to
> handle PRs from 4.6.1 onward. If you don't understand what I'm talking
> about, please feel free to bother me with questions.
>
> I had a discussion with Remi last night about refusing PRs or not based on
> the premiss they are fixing bugs in the prior version as well. If a PR can
> be applied on a prior version I think we should just do this and not bother
> the contributor with it. We can apply it on a prior branch and merge it
> forward. It might give and extra burden on us for closing the PR but the
> other side is that it will not discourage contributors.
>
> thoughts?
> --
> Daan
>
>


-- 
Daan

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message