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
