Hi,
> our "experimental" Git branch is generally used to merge stuff that is
> not quite ready for a proper pull request, but could use some testing.
> Best case, this stuff will make it into the next major Tails release.
> Our "devel" Git branch is generally used to prepare the next major
> release. Our next major release is 1.1 (Wheezy).
>
> So, I propose we merge feature/wheezy into the devel and experimental
> branches, and use these branches (as usual) to prepare the next major
> release. Then, feature/wheezy can simply be ignored from now on.
>
> Also, until now I've been freely pushing stuff to feature/wheezy,
> without going through our usual review'n'merge process. I think it's
> great time to stop that. So, I propose that when working on 1.1, we
> now use feature branches forked off the (Wheezy-based) devel branch,
> and go through the usual review and merge process.
>
> Does this all make sense for you?
>
Totally.
> I've got two additional questions, mainly for anonym (with his RM
> hat):
>
> * do you think you can take care, in a timely manner, of the many
> review'n'merge requests that will be sent if we go this way?
>
> * could you please review the current devel..feature/wheezy delta,
> as a starting point? ETA?
>
We could also share this work if necessary.
Cheers
