Re:Extremely Linear Git History
by foobarbecue on Tuesday November 22, 2022 @09:52AM
(#33706418)
> Developer end up fixing additional issues in the merge commit instead of actual commits.
As long as the merge commit is being reviewed with the rest of the PR, that's fine, right? (We use rebase while working on feature branches, and then squash & merge for completed PRs, which seems to be the best of both worlds)
As long as the merge commit is being reviewed with the rest of the PR, that's fine, right? (We use rebase while working on feature branches, and then squash & merge for completed PRs, which seems to be the best of both worlds)