I suggest, the bug fixes of the release version are preferentially merged into the release branch. Then the reviewer of PR are merged into the dev branch.
****************************** Apache DolphinScheduler Hemin Wen (温合民) [email protected] Xiaochun Liu <[email protected]> 于2020年5月18日周一 下午10:46写道： > > If everyone merge the changes on the release branch into the dev branch > immediately, > and it will not cost too much extra time. Because each change is limited, > or there are very few conflicts. > > Best Regards > --------------- > DolphinScheduler(Incubator) Committer > Xiaochun Liu 刘小春 > [email protected] > --------------- > > > > > 2020年5月18日 下午10:40，lidong dai <[email protected]> 写道： > > > > any other's ideas? > > > > > > > > Best Regards > > --------------- > > DolphinScheduler(Incubator) PPMC > > Lidong Dai 代立冬 > > [email protected] > > --------------- > > > > > > leon bao <[email protected]> 于2020年5月15日周五 上午10:32写道： > > > >> i agree to merge the changes to 'dev' timely. > >> but how do we do it？ > >> whether the person who merges the code to merge the changes into the > main > >> branch. > >> > >
