message no. 180836
Posted by canton7 in #github at 2020-05-21T08:20:26Z
Lewix, depends. We use rebasing for feature branches before they go into review, because it's a bit easier to fix up merge conflicts bit-by-bit, and it keeps the history cleaner for the reviewers. Once it's been reviewed we switch to merge-only, because otherwise the history of the review gets muddled between old and new versions of the commits