>     When a PR labeled with "dev/backlog" is explicitly to be merged into
a dev branch, remove the "dev/backlog" label and add the dev label of the
corresponding branch.

Are you referring to the dev branch as master branch ?
So if the PR that does not belong to 1.0 , can it be merged into master
directly?

Secondly, if a PR belongs to version 1.0.
So when merging this PR, do you have to merge it into the master
branch and *manually
pick *it into the 1.0 branch?

Ling Miao

41108453 <41108...@qq.com.invalid> 于2022年2月23日周三 23:54写道:

> +1
>
>
>
>
>
> ------------------ Original ------------------
> From: 陈明雨 <morning...@163.com&gt;
> Date: Wed,Feb 23,2022 11:44 PM
> To: doris-dev <dev@doris.apache.org&gt;
> Subject: Re: [DISCUSS] Weekly build and prepare for releasing 1.0
>
>
>
> Hi All,
> At present, the main features of version 1.0 are in the final stage of
> development. Stability and bug fixing work will be carried out later.
> We are currently encountering some problems:
> 1. some features that have not been fully validated have been merged in,
> affecting the testing of existing features, resulting in problems that have
> not been converged.
> 2. have been unable to maintain a stable baseline version, resulting in
> uncontrollable release cycle.
>
>
> In response, I will take the following steps to ensure that the problem is
> converged and manageable.
>
>
> 1. PR tagging
> &nbsp;&nbsp;&nbsp; All PRs must be labeled with the following tags.
> &nbsp;&nbsp;&nbsp; For example, dev-1.0.0 for the first week and dev-1.0.1
> for the second week.
> &nbsp;&nbsp;&nbsp; After the branch is created, the branch will only
> selectively merge in PRs tagged with "dev/1.0.0".
> &nbsp;&nbsp;&nbsp; All subsequent PRs must be labeled as follows.
> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - dev/1.0.0: Indicates that
> this PR needs to be merged into the dev-1.0.0 branch.
> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; - dev/backlog: Indicates that
> the PR is not to be merged into any dev branch at this time.
> &nbsp;&nbsp;&nbsp; When a PR labeled with "dev/backlog" is explicitly to
> be merged into a dev branch, remove the "dev/backlog" label and add the dev
> label of the corresponding branch.
>
>
> 2. PR merge principle
> &nbsp;&nbsp;&nbsp; After a PR Approve, it should, in principle, stay at
> least one day before it is merged in, so that other reviewers can make
> possible confirmation.
> &nbsp;&nbsp;&nbsp; If you need to merge quickly, please comment in the PR
> to explain the reason.
> &nbsp;&nbsp;&nbsp; All PRs must have a clear dev label before merging in.
>
>
> The final Release version will be generated from the dev branch.
> I will follow up and push for this to happen, if others would like to
> participate in this effort, or have suggestions or comments, please feel
> free to discuss.
>
>
>
> --
>
> 此致!Best Regards
> 陈明雨 Mingyu Chen
>
> Email:
> chenmin...@apache.org

Reply via email to