You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Some repos have encountered issues because agency users mistakenly used squash and merge to merge changes on their staging branch to master - this could potentially cause merge conflicts because squash and merge creates an entirely new commit instead of preserving the existing commits, so a squashed commit is treated as different from what already exists on staging. To rectify this, we should ban squash and merge for new repos, since new repos should be using the cms and have no need for branches off staging.
We can do this by adding allow_squash_merge: true
as a parameter to the create request:
Some repos have encountered issues because agency users mistakenly used
squash and merge
to merge changes on their staging branch to master - this could potentially cause merge conflicts becausesquash and merge
creates an entirely new commit instead of preserving the existing commits, so a squashed commit is treated as different from what already exists on staging. To rectify this, we should ban squash and merge for new repos, since new repos should be using the cms and have no need for branches off staging.We can do this by adding
allow_squash_merge: true
as a parameter to the create request:
The text was updated successfully, but these errors were encountered: