diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2021-01-14 21:04:27 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-01-14 21:04:27 +0300 |
| commit | 5ab04947877a3ab6d72ba6faafd5d8cd0b11baeb (patch) | |
| tree | 4bcf63106c5e9ee1aa27a48ac13c6bd5538a1bb5 | |
| parent | b12fd1b88b4f2a9f43c3e96713bd7ade980e46a6 (diff) | |
Enable Go version of ResolveConflicts by default
| -rw-r--r-- | changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml | 5 | ||||
| -rw-r--r-- | internal/metadata/featureflag/feature_flags.go | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml b/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml new file mode 100644 index 000000000..eb6ac6024 --- /dev/null +++ b/changelogs/unreleased/po-resolve-conflicts-featureflag-removal.yml @@ -0,0 +1,5 @@ +--- +title: Enable Go version of ResolveConflicts by default +merge_request: 3007 +author: +type: performance diff --git a/internal/metadata/featureflag/feature_flags.go b/internal/metadata/featureflag/feature_flags.go index 18a987a6b..32e528fc9 100644 --- a/internal/metadata/featureflag/feature_flags.go +++ b/internal/metadata/featureflag/feature_flags.go @@ -30,7 +30,7 @@ var ( // GoUserCommitFiles enables the Go implementation of UserCommitFiles GoUserCommitFiles = FeatureFlag{Name: "go_user_commit_files", OnByDefault: false} // GoResolveConflicts enables the Go implementation of ResolveConflicts - GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: false} + GoResolveConflicts = FeatureFlag{Name: "go_resolve_conflicts", OnByDefault: true} // GoFetchRemote enables the Go implementation of FetchRemote GoFetchRemote = FeatureFlag{Name: "go_fetch_remote", OnByDefault: true} // GoUserDeleteTag enables the Go implementation of UserDeleteTag |