After finishing my work on a feature branch. Should I merge the main branch into the feature branch and then merge the feature branch back into the main branch, or should I rebase instead?