> IMHO if we need to trace the commit history later, we could keep the branch after merging it instead of deleting it.
This usually does not work well since the new commits won't be merged to the feature branch anymore. > From the whole project angle, +1 on Rebase. Cleaner history, easier trouble shooting and faster development. Agree. In the case of HDDS-4454, we don't expect a lot of conflicts since we are mainly adding new code. How about we try rebase first? If there are too many conflicts, we may switch to merge. Tsz-Wo
