/
githubmirror
/
gitness
Обзор
Документация
Войти
/
githubmirror
/
gitness
Код
Запросы
0
Пакеты
0
Релизы
0
Аналитика
Безопасность
main
git/enum/merge.go
45 строк
1 KB
Marko Gaćeša
feat: [CODE-2385]: add fast-forward merge (#2718)
23 сен 2024, 14:34
23 сен 2024, 14:34
7c83c55
Код
Авторство
О чём код?
// Copyright 2023 Harness, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. package enum // MergeMethod represents the approach to merge commits into base branch. type MergeMethod string const ( // MergeMethodMerge create merge commit. MergeMethodMerge MergeMethod = "merge" // MergeMethodSquash squash commits into single commit before merging. MergeMethodSquash MergeMethod = "squash" // MergeMethodRebase rebase before merging. MergeMethodRebase MergeMethod = "rebase" // MergeMethodFastForward fast-forward merging. MergeMethodFastForward MergeMethod = "fast-forward" ) var MergeMethods = []MergeMethod{ MergeMethodMerge, MergeMethodSquash, MergeMethodRebase, MergeMethodFastForward, } func (m MergeMethod) Sanitize() (MergeMethod, bool) { switch m { case MergeMethodMerge, MergeMethodSquash, MergeMethodRebase, MergeMethodFastForward: return m, true default: return MergeMethodMerge, false } }