Hi Arpit, That helps a lot. Will stay tuned for this discussion.
Thanks, Xiang Arpit Agarwal <aagar...@cloudera.com.invalid> 于2021年8月12日周四 上午11:25写道： > Hi Xiang, > > Yes, significant feature development like HDDS-4454 is done in a separate > branch which must be periodically synced with master via either merge or > rebase. When the feature development is complete the branch is merged back > into master. > > Bugfixes and small improvements are directly committed to master. Hope > that helps. > > Thanks, > Arpit > > > > On Aug 12, 2021, at 8:52 AM, Xiang Zhang <xiangzhang1...@gmail.com> > wrote: > > > > Thanks Arpit for explaining the difference between merge and rebase. > > > > I am wondering why this "merge or rebase" question does not arise for > other > > tickets. Is it because HDDS-4454 brings significant change or something > > else ? > > > > Arpit Agarwal <aagar...@cloudera.com.invalid> 于2021年8月12日周四 上午11:00写道： > > > >> Rebase keeps the history cleaner at cost of conflict resolution > overhead. > >> Merge might be less work for devs. > >> > >> > >>> On Aug 12, 2021, at 7:25 AM, Tsz Wo Sze <szets...@apache.org> wrote: > >>> > >>> Hi Ozone dev, > >>> > >>> We should discuss whether we want to do "merge" or "rebase" for > >>> the HDDS-4454 branch. This a standard git question: > >>> > >> > https://stackoverflow.com/questions/804115/when-do-you-use-git-rebase-instead-of-git-merge > >>> > >>> I suggest to do "rebase" rather than "merge" since it can keep the > commit > >>> history. Any thoughts? > >>> > >>> Tsz-Wo > >> > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@ozone.apache.org > >> For additional commands, e-mail: dev-h...@ozone.apache.org > >> > >> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@ozone.apache.org > For additional commands, e-mail: dev-h...@ozone.apache.org > >
